path="${1}"
uuid="$(cat /conf/uuid.conf)"
- for try_uuid_file in "${mountpoint}/.disk/live-uuid"*
+ for try_uuid_file in "${path}/.disk/live-uuid"*
do
[ -e "${try_uuid_file}" ] || continue
{
sysfs_path="${1#/sys}"
- if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-[ide|scsi|usb])"
+ if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb))"
then
return 0
elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
- # FIXME: This for loop is an ugly HACK round an nfs bug
- for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13
+ # FIXME: This while loop is an ugly HACK round an nfs bug
+ i=0
+ while [ "$i" -lt 60 ]
do
nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
sleep 1
+ i="$(($i + 1))"
done
return ${rc}
fi
# or do the scan of block devices
- for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-' | grep -v fd )
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
livefs_root=${ROOT}
else
# Scan local devices for the image
- for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+ i=0
+ while [ "$i" -lt 60 ]
do
livefs_root=$(find_livefs ${i})
fi
sleep 1
+ i="$(($i + 1))"
done
fi
fi