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>
This commit is contained in:
parent
34c7ce7193
commit
bc8ec134e1
@ -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}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user