Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/iso/mkarchiso486
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2022-09-29 11:41:41 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2022-09-29 11:41:41 +0200
commitcccd423817f5dee7e126774cde7db378aad97b1d (patch)
tree4257d02dc89a96c9160b441a4d68f7aa0cdc096e /iso/mkarchiso486
parentb2bc28ac281e44512640bf16b2816ff5f12ab498 (diff)
better TIMEOUT in syslinux, removed joe
Diffstat (limited to 'iso/mkarchiso486')
-rwxr-xr-xiso/mkarchiso4868
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