From: Daniel Baumann <daniel@debian.org>
Date: Tue, 7 Apr 2009 18:39:20 +0000 (+0200)
Subject: Applying patch from Michael Prokop <mika@grml.org> to support udev >= 0.140.
X-Git-Tag: debian/2.0.15-1~323
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=3cd34c818ca9695d0b5a8bab80c0ef08544acfbf;p=live-boot-grml.git

Applying patch from Michael Prokop <mika@grml.org> to support udev >= 0.140.
---

diff --git a/hooks/live b/hooks/live
index 32adfb6..4e29226 100755
--- a/hooks/live
+++ b/hooks/live
@@ -148,7 +148,10 @@ else
 	copy_exec /sbin/udevtrigger /sbin
 	copy_exec /sbin/udevsettle /sbin
 fi
-copy_exec /usr/bin/udevinfo /bin
+if [ -x /usr/bin/udevinfo ]
+then
+	copy_exec /usr/bin/udevinfo /bin
+fi
 
 # Program: wget
 if [ -x /usr/bin/wget ]
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 70897d6..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 ()