X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=59bdb4fd673c9dc4c4d631b159af394ee5448915;hb=4cd6c6da3f64150a41dabd41148012377bbf0390;hp=89708341f969811815c0481607878a0551a3befa;hpb=65b87457c49ed23c23906505eaf65dae1b9cfae8;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 8970834..59bdb4f 100644
--- 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