tools/archiso
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the last "device exists check"

Browse source 
Looks like my last-minute addition was goofed.
Use && not ||

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
Gerhard Brauer 2008-12-23 07:36:54 -08:00 • committed by Aaron Griffin
parent e639b95237
commit f7d183588c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
archiso/hooks/archiso
View file

@ -61,7 +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 [ ! -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
@ -77,7 +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 [ ! -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