Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerhard Brauer <gerbra@archlinux.de>2008-12-23 07:36:54 -0800
committerAaron Griffin <aaronmgriffin@gmail.com>2008-12-23 07:36:54 -0800
commitf7d183588c790444a468f475792fffc37f0a8ffd (patch)
tree90c20f63107eddf4da11c80fb2e8a052cc6899a3
parente639b95237de0163dffc4e949d10e01dc692e0b2 (diff)
Fix the last "device exists check"
Looks like my last-minute addition was goofed. Use && not || Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r--archiso/hooks/archiso4
1 files changed, 2 insertions, 2 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index b01addb..0c71abe 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -61,7 +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
+ [ ! -e "${cdrom}" ] && continue
if mount -r -t iso9660 "${cdrom}" /bootmnt >/dev/null 2>&1; then
if [ -e "/bootmnt/isomounts" ]; then
found=1
@@ -77,7 +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
+ [ ! -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