summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x2_install.sh2
-rwxr-xr-x3_configure.sh14
2 files changed, 8 insertions, 8 deletions
diff --git a/2_install.sh b/2_install.sh
index 3beb727..be8d5dd 100755
--- a/2_install.sh
+++ b/2_install.sh
@@ -23,7 +23,7 @@ else
fi
# Finalize root filesystem
-if [ "$ROOTFS" = "isofs" ]; then
+if [ "$ROOTFS" = "iso" ]; then
mkdir "$targettemp_isofs"
# FIXME: not yet implemented!
echo 'ARRGH - this is not possible (should have failed earlier)!'
diff --git a/3_configure.sh b/3_configure.sh
index 4ec72d0..e8084e7 100755
--- a/3_configure.sh
+++ b/3_configure.sh
@@ -6,10 +6,10 @@ set -e
. ./common-functions || exit 1
# Check if already installed
-if ! ./chroot.sh grep -q 'root::' "/etc/shadow"; then
- echo 'ERROR: rootfd already (halfway?) configured!' >&2
- exit 1
-fi
+#if ! ./chroot.sh grep -q 'root::' "/etc/shadow"; then
+# echo 'ERROR: rootfd already (halfway?) configured!' >&2
+# exit 1
+#fi
# Install MBR, GRUB and SYSLINUX
[ -n "$grubdev_host" ] && mkgrubdevmap "$usbdev_host" >"$baseworkdir/grub_host_device.map"
@@ -20,13 +20,13 @@ if [ "$MBR" = "yes" ]; then
[ -n "$grubdev_host" ] && echo -e "root ($grubdev_grub)\nsetup ($grubdev_grub)" | grub --batch --device-map="$baseworkdir/grub_host_device.map"
elif [ -n "$grubdev_host" ]; then
echo -e "root ($grubdev_grub)\nsetup ($usbdev_grub)" | grub --batch --device-map="$baseworkdir/grub_host_device.map"
-elif [ -n "$syslinuxdev_host" ] && [ "$ROOTFS" = "ext2fs" ]; then
+elif [ -n "$syslinuxdev_host" ] && [ "$ROOTFS" = "ext2" ]; then
makebootfat -o "$syslinuxdev_host" -X -P -b /usr/lib/syslinux/ldlinux.bss -c /usr/lib/syslinux/ldlinux.sys "$targettemp_fat"
-elif [ -n "$syslinuxdev_host" ] && [ "$ROOTFS" = "dosfs" ]; then
+elif [ -n "$syslinuxdev_host" ] && [ "$ROOTFS" = "dos" ]; then
# This should make sticks be recognized as both USB-FDD and USB-HDD.
# (VIA EPIA mobos will boot only as USB-ZIP, however :-( )
makebootfat -o "$usbdev_host" -X -D -b /usr/lib/syslinux/ldlinux.bss -m /usr/lib/makebootfat/mbrfat.bin -F -c /usr/lib/syslinux/ldlinux.sys "$targettemp_isofs"
-elif [ -n "$syslinuxdev_host" ] && [ "$ROOTFS" = "isofs" ]; then
+elif [ -n "$syslinuxdev_host" ] && [ "$ROOTFS" = "iso" ]; then
# This should make sticks be recognized as both USB-FDD and USB-HDD.
# (VIA EPIA mobos will boot only as USB-ZIP, however :-( )
makebootfat -o "$usbdev_host" -X -D -b /usr/lib/syslinux/ldlinux.bss -m /usr/lib/makebootfat/mbrfat.bin -F -c /usr/lib/syslinux/ldlinux.sys "$targettemp_isofs"