From: Daniel Baumann <daniel@debian.org>
Date: Mon, 21 Nov 2011 11:29:25 +0000 (+0100)
Subject: Update udevs path_id changes as of version 174, thanks to Baurzhan Muftakhidinov... 
X-Git-Tag: debian/3.0_a23-1~24
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=b532cab8c4c56226854c70553902a6e295d68650

Update udevs path_id changes as of version 174, thanks to Baurzhan Muftakhidinov <baurthefirst@gmail.com> for spotting it.
---

diff --git a/scripts/live b/scripts/live
index e69396e..6080841 100755
--- a/scripts/live
+++ b/scripts/live
@@ -485,7 +485,16 @@ is_nice_device ()
 {
 	sysfs_path="${1#/sys}"
 
-	if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
+	if [ -e /lib/udev/path_id ]
+	then
+		# squeeze
+		PATH_ID="/lib/udev/path_id"
+	else
+		# wheezy/sid (udev >= 174)
+		PATH_ID="/sbin/udevadm test-builtin path_id"
+	fi
+
+	if "${PATH_ID}" "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'