From 29f5c0373c0f4a86f327995e8b7f3eceb8775521 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 23 Dec 2008 02:17:59 -0600 Subject: Add existence checks to the boot-media scan This prevents some cosmetic errors when globbing fails and the scripts try to mount something silly like "/dev/hd[a-z]" Signed-off-by: Aaron Griffin --- archiso/hooks/archiso | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index fdbd514..b01addb 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -61,6 +61,7 @@ run_hook () /bin/modprobe -q isofs >/dev/null 2>&1 msg ":: Scanning cd drives..." for cdrom in /dev/hd[a-z] /dev/sr[0-9]* /dev/scd[a-z] /dev/sg[0-9]*; do + [ ! -e "${cdrom}" ] || continue if mount -r -t iso9660 "${cdrom}" /bootmnt >/dev/null 2>&1; then if [ -e "/bootmnt/isomounts" ]; then found=1 @@ -76,6 +77,7 @@ run_hook () if [ ${found} -eq 0 ]; then msg ":: Scanning usb drives..." for usb in /dev/sd[a-z][0-9]; do + [ ! -e "${usb}" ] || continue if mount -r -t vfat "${usb}" /bootmnt >/dev/null 2>&1 ||\ mount -r -t ext2 "${usb}" /bootmnt >/dev/null 2>&1; then if [ -e "/bootmnt/isomounts" ]; then -- cgit v1.2.3-70-g09d2