summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-11-21 12:29:25 +0100
committerDaniel Baumann <daniel@debian.org>2011-11-24 09:40:41 +0100
commitb532cab8c4c56226854c70553902a6e295d68650 (patch)
treeef240b5108795e4045d403aa02825534c35e6a4e /scripts
parentdde97bb32a6c30e3329485d2d3e2b35539339b8d (diff)
downloadlive-boot-b532cab8c4c56226854c70553902a6e295d68650.tar.gz
live-boot-b532cab8c4c56226854c70553902a6e295d68650.zip
Update udevs path_id changes as of version 174, thanks to Baurzhan Muftakhidinov <baurthefirst@gmail.com> for spotting it.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live11
1 files changed, 10 insertions, 1 deletions
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]$'