summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-10-10 22:57:29 -0500
committerDan McGee <dan@archlinux.org>2007-10-10 23:05:26 -0500
commitbc8ec134e107af1e92871ebba0b1d5c6e8cae9bc (patch)
tree754828fdbebd44046fe99b85f6e14d497625c6c4
parent34c7ce71932e9edf3640928f65652d37415a6fc0 (diff)
downloadarchiso32-bc8ec134e107af1e92871ebba0b1d5c6e8cae9bc.tar.xz
Slight updates to initcpio hooks
* Get rid of unnecessary trailing slash on BOOT_MOUNT variable * Fix -eq/= mixup- we are comparing strings, not numbers * Don't unmount /dev, as it was never mounted Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--hooks/archiso3
-rw-r--r--hooks/boot-cd2
-rw-r--r--hooks/boot-usb2
3 files changed, 3 insertions, 4 deletions
diff --git a/hooks/archiso b/hooks/archiso
index 43bbdad..f06e56b 100644
--- a/hooks/archiso
+++ b/hooks/archiso
@@ -7,7 +7,7 @@ run_hook ()
mount -t tmpfs -o "size=${ramdisk_size}" tmpfs /tmpfs
msg "done."
- if [ "x${BOOT_MOUNT}" -eq "x" ]; then
+ if [ "x${BOOT_MOUNT}" = "x" ]; then
echo "ERROR: BOOT_MOUNT is not set. The boot-cd or boot-usb hook MUST"
echo " be run before this one. This image was improperly built"
exit 1
@@ -50,7 +50,6 @@ run_hook ()
msg ":: Passing control to Archlinux Initscripts...Please Wait"
/bin/umount /sys
/bin/umount /proc
- /bin/umount /dev
exec /bin/run-init -c /dev/console /real_root /sbin/init ${CMDLINE}
}
diff --git a/hooks/boot-cd b/hooks/boot-cd
index a9b6f61..1773023 100644
--- a/hooks/boot-cd
+++ b/hooks/boot-cd
@@ -3,7 +3,7 @@ run_hook ()
msg ":: Scanning for boot cdrom device..."
/bin/mkdir -p /bootmnt
- bootmnt="/bootmnt/"
+ bootmnt="/bootmnt"
found=0
/bin/modprobe -q isofs >/dev/null 2>&1
diff --git a/hooks/boot-usb b/hooks/boot-usb
index 4645c5a..67e00dd 100644
--- a/hooks/boot-usb
+++ b/hooks/boot-usb
@@ -3,7 +3,7 @@ run_hook ()
msg ":: Scanning for boot usb device..."
/bin/mkdir -p /tmpfs/bootmnt
- bootmnt="/tmpfs/bootmnt/"
+ bootmnt="/tmpfs/bootmnt"
found=0
for usb in /dev/sd[a-z][0-9]; do