diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-06-24 21:54:49 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-06-24 21:54:49 +0200 |
| commit | b14538aeeb0e9422d827f3ef183aa50baa2fa693 (patch) | |
| tree | c36441f0f8ddbc42bd61e4ad39bb8e1e22c932aa | |
| parent | a6c584bc1a6ba62db09014487e81210546c37e81 (diff) | |
| download | live-boot-b14538aeeb0e9422d827f3ef183aa50baa2fa693.tar.gz live-boot-b14538aeeb0e9422d827f3ef183aa50baa2fa693.zip | |
Dropping old pre-wheezy udevadm handling.
| -rwxr-xr-x | components/9990-aaa-fixme.sh | 9 | ||||
| -rwxr-xr-x | components/9990-misc-helpers.sh | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/components/9990-aaa-fixme.sh b/components/9990-aaa-fixme.sh index 6fc12f9..5a39739 100755 --- a/components/9990-aaa-fixme.sh +++ b/components/9990-aaa-fixme.sh @@ -30,15 +30,6 @@ then export PATH 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 - custom_overlay_label="persistence" persistence_list="persistence.conf" old_persistence_list="live-persistence.conf" diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 82099a4..194b871 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -81,7 +81,7 @@ is_nice_device () { sysfs_path="${1#/sys}" - if /sbin/udevadm test-builtin 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 udevadm test-builtin 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]$' @@ -379,7 +379,7 @@ is_in_comma_sep_list () sys2dev () { sysdev=${1#/sys} - echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})" + echo "/dev/$(udevadm info -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})" } subdevices () |