Adding upstream version 1.157.2.

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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 8970834..59bdb4f 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -6,10 +6,19 @@ then
        export PATH="${PATH}:/usr/lib/klibc/bin"
 fi
 
+# handle upgrade path from old udev (using udevinfo) to
+# recent versions of udev (using udevadm info)
+if [ -x /sbin/udevadm ]
+then
+       udevinfo='/sbin/udevadm info'
+else
+       udevinfo='udevinfo'
+fi
+
 sys2dev ()
 {
        sysdev=${1#/sys}
-       echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
+       echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
 }
 
 subdevices ()
@@ -332,7 +341,7 @@ find_cow_device ()
                        fi
 
                        case "$(get_fstype ${devname})" in
-                               vfat|ext2|ext3|jffs2)
+                               vfat|ext2|ext3|ext4|jffs2)
                                        mkdir -p "${cow_backing}"
                                        if ! try_mount "${devname}" "${cow_backing}" "rw"
                                        then