faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add existence checks to the boot-media scan

Browse Source 
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 <aaronmgriffin@gmail.com>
This commit is contained in:
Aaron Griffin 2008-12-23 02:17:59 -06:00
parent 9102eadfd3
commit 29f5c0373c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiso/hooks/archiso
View File

@ -61,6 +61,7 @@ run_hook ()
/bin/modprobe -q isofs >/dev/null 2>&1 /bin/modprobe -q isofs >/dev/null 2>&1
msg ":: Scanning cd drives..." msg ":: Scanning cd drives..."
for cdrom in /dev/hd[a-z] /dev/sr[0-9]* /dev/scd[a-z] /dev/sg[0-9]*; do 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 mount -r -t iso9660 "${cdrom}" /bootmnt >/dev/null 2>&1; then
if [ -e "/bootmnt/isomounts" ]; then if [ -e "/bootmnt/isomounts" ]; then
found=1 found=1
@ -76,6 +77,7 @@ run_hook ()
if [ ${found} -eq 0 ]; then if [ ${found} -eq 0 ]; then
msg ":: Scanning usb drives..." msg ":: Scanning usb drives..."
for usb in /dev/sd[a-z][0-9]; do for usb in /dev/sd[a-z][0-9]; do
[ ! -e "${usb}" ] || continue
if mount -r -t vfat "${usb}" /bootmnt >/dev/null 2>&1 ||\ if mount -r -t vfat "${usb}" /bootmnt >/dev/null 2>&1 ||\
mount -r -t ext2 "${usb}" /bootmnt >/dev/null 2>&1; then mount -r -t ext2 "${usb}" /bootmnt >/dev/null 2>&1; then
if [ -e "/bootmnt/isomounts" ]; then if [ -e "/bootmnt/isomounts" ]; then