better TIMEOUT in syslinux, removed joe

3 files changed, 13 insertions, 13 deletions

diff --git a/iso/isolinux-i486.cfg b/iso/isolinux-i486.cfg
index 4fe2ab2..104c2d4 100644
--- a/iso/isolinux-i486.cfg
+++ b/iso/isolinux-i486.cfg
@@ -1,6 +1,7 @@
 DEFAULT arch32
-TIMEOUT 5
-TOTALTIMEOUT 5
+TIMEOUT 100
+TOTALTIMEOUT 100
+PROMPT 1
 
 LABEL arch32
 TEXT HELP
diff --git a/iso/mkarchiso486 b/iso/mkarchiso486
index 1d12302..183de45 100755
--- a/iso/mkarchiso486
+++ b/iso/mkarchiso486
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-BASE=/root/archi486
+set -e
+
+BASE=/root/archi486/iso
 ROOTFS="$BASE/airootfs"
 ROOTMNT="$BASE/mnt"
 
-umount "$ROOTMNT"
+umount "$ROOTMNT" || true
 rm -rf "$ROOTFS"
 rm -f "$BASE/pacman-i486.conf"
 rm -f "$BASE/mirrorlist32"
@@ -45,7 +47,7 @@ echo "Preparing keyring inside chroot.."
 linux32 arch-chroot "$ROOTMNT" /bin/bash -c 'pacman-key --init'
 linux32 arch-chroot "$ROOTMNT" /bin/bash -c 'pacman-key --populate archlinux'
 linux32 arch-chroot "$ROOTMNT" /bin/bash -c 'pacman-key --populate archlinux32'
-linux32 arch-chroot "$ROOTMNT" /bin/bash -c 'pacman -Syyu --noconfirm syslinux dhclient dhcpcd pciutils nano joe vi arch-install-scripts openssh'
+linux32 arch-chroot "$ROOTMNT" /bin/bash -c 'pacman -Syyu --noconfirm syslinux dhclient dhcpcd pciutils nano vi arch-install-scripts openssh'
 
 echo "Install configuration.."
 for i in 1 2 3 4; do
diff --git a/iso/motd b/iso/motd
index 8ae5a3a..1fc94ff 100644
--- a/iso/motd
+++ b/iso/motd
@@ -2,19 +2,14 @@ Archlinux32, i486 ISO for low-memory systems
 
 Enable a network first with for instance 'dhclient'.
 
-Consider to create a swap partition as very first
-action and mount it before calling 'pacstrap'.
+Create und mount a swap partition and mount a /tmp to 
+/mnt/tmp as bind mountpoint as very first action before
+trying to install something with pacstrap/pacman..
 
 The CD is read-only, you may want to copy '/etc/pacman.conf'
 to '/tmp/pacman.conf' and use 'pacstrap -c /tmp/pacman.conf'
 if you have to change settings.
 
-Set 'iommu=off' to regain some memory.
-
-Create und mount a swap partition and mount a /tmp to 
-/mnt/tmp as bind mountpoint as very first action before
-trying to install something with pacstrap/pacman..
-
 With less than 196MB RAM pacman/gpg fails to verify
 signatures, create a local /mnt/pacman.conf where you
 set 'SigLevel=Never' and specify '-C /mnt/pacman.conf'.
@@ -29,3 +24,5 @@ system too 'systemctl mask tmp.mount'.
 
 Remember to compile your own static kernel or create
 a stripped-down ramdisk if you have little memory.
+
+Set 'iommu=off' to regain some memory.