Adding noprompt={usb,cd} feature.

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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 6edd51c..0e9b0d0 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1,4 +1,4 @@
-# live-initramfs helper functions, used by live-initramfs on boot and by live-snapshot
+# live-boot helper functions, used by live-boot on boot and by live-snapshot
 
 if [ ! -x "/bin/fstype" ]
 then
@@ -76,17 +76,7 @@ is_supported_fs ()
 
 get_fstype ()
 {
-       # udev >=146-1 no longer provides vol_id:
-       if [ -x /lib/udev/vol_id ]
-       then
-               /lib/udev/vol_id -t ${1} 2>/dev/null
-       else
-               eval $(blkid -o udev "${1}")
-               if [ -n "$ID_FS_TYPE" ]
-               then
-                       echo "${ID_FS_TYPE}"
-               fi
-       fi
+       /sbin/blkid -s TYPE -o value $1 2>/dev/null
 }
 
 where_is_mounted ()
@@ -189,16 +179,13 @@ setup_loop ()
        local encryption=${5}
        local readonly=${6}
 
-       modprobe -q -b "${module}"
+       # the output of setup_loop is evaluated in other functions,
+       # modprobe leaks kernel options like "libata.dma=0"
+       # as "options libata dma=0" on stdout, causing serious
+       # problems therefor, so instead always avoid output to stdout
+       modprobe -q -b "${module}" 1>/dev/null
 
-       if [ -x /sbin/udevadm ]
-       then
-               # lenny
-               udevadm settle
-       else
-               # etch
-               udevsettle
-       fi
+       udevadm settle
 
        for loopdev in ${pattern}
        do
@@ -314,7 +301,7 @@ find_cow_device ()
                do
                        devname=$(sys2dev "${dev}")
 
-                       if echo "${black_listed_devices}" | grep -q "${devname}"
+                       if echo "${black_listed_devices}" | grep -q -w "${devname}"
                        then
                                # skip this device enterely
                                break
@@ -350,21 +337,10 @@ find_cow_device ()
                                done
                        fi
 
-                       # udev >=146-1 no longer provides vol_id:
-                       if [ -x /lib/udev/vol_id ]
+                       if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
                        then
-                               if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
-                               then
-                                       echo "${devname}"
-                                       return 0
-                               fi
-                       else
-                               eval $(blkid -o udev "${devname}")
-                               if [ "$ID_FS_LABEL" = "${pers_label}" ]
-                               then
-                                       echo "${devname}"
-                                       return 0
-                               fi
+                               echo "${devname}"
+                               return 0
                        fi
 
                        if [ "${PERSISTENT}" = "nofiles" ]
@@ -412,7 +388,7 @@ find_files ()
                        devname=$(sys2dev "${dev}")
                        devfstype="$(get_fstype ${devname})"
 
-                       if echo "${black_listed_devices}" | grep -q "${devname}"
+                       if echo "${black_listed_devices}" | grep -q -w "${devname}"
                        then
                                # skip this device enterely
                                break