[SCM] live-boot branch, debian-next, updated. debian/3.0_a22-1-2-g62e8bfc

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 62e8bfc13fa085b9a5ccc5b77babbde618c4a553
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Nov 21 12:29:25 2011 +0100

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

diff --git a/scripts/live b/scripts/live
index e69396e..6bcfd86 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 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]$'

-- 
live-boot