Merging casper 1.153.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index 9c747d5..bf20ffc 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -286,9 +286,9 @@ Arguments ()
                                export NOPROGRAMCRASHES
                                ;;
 
-                       norestrictedmanager)
-                               NORESTRICTEDMANAGER="Yes"
-                               export NORESTRICTEDMANAGER
+                       nojockey)
+                               NOJOCKEY="Yes"
+                               export NOJOCKEY
                                ;;
 
                        nosudo)
@@ -509,7 +509,7 @@ matches_uuid ()
        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
 
@@ -578,7 +578,7 @@ is_nice_device ()
 {
        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]$'
@@ -799,11 +799,13 @@ do_nfsmount ()
 
        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}
@@ -1369,7 +1371,7 @@ find_livefs ()
        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}")
@@ -1461,7 +1463,8 @@ mountroot ()
                        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})
 
@@ -1471,6 +1474,7 @@ mountroot ()
                                fi
 
                                sleep 1
+                               i="$(($i + 1))"
                        done
                fi
        fi