better TIMEOUT in syslinux, removed joe

1 files changed, 5 insertions, 3 deletions

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