diff options
| author | Vagrant Cascadian <vagrant@debian.org> | 2017-09-10 10:22:39 -0700 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2017-09-10 10:22:39 -0700 |
| commit | 56276a32079d90d3a1a9e249927bc48144c1ff97 (patch) | |
| tree | 19090a53a6aa6c21170f0ecba7660ba8723ca43d | |
| parent | c6a201fbf76a6e0bfacde8acff1b89f7389ec974 (diff) | |
Call udevadm without a path, and drop support for obsolete udevinfo
command. https://bugs.debian.org/852590
| -rw-r--r-- | scripts/ltspfs_entry | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/scripts/ltspfs_entry b/scripts/ltspfs_entry index a241098..39b4ef4 100644 --- a/scripts/ltspfs_entry +++ b/scripts/ltspfs_entry @@ -149,7 +149,7 @@ verify_device() { LOCALDEV_DENY="ID_BUS:ata+ID_TYPE:disk,ID_BUS:scsi+ID_TYPE:disk,$LOCALDEV_DENY" fi - # Deny mounting by sysfs attribute from udevinfo (in environment) + # Deny mounting by sysfs attribute from udevadm info (in environment) # LOCALDEV_DENY is a comma-separated list of var=val pairs if [ -n "${LOCALDEV_DENY}" ]; then oldifs=$IFS @@ -161,7 +161,7 @@ verify_device() { var=$(echo $deny_rule|cut -d: -f1) val=$(echo $deny_rule|cut -d: -f2) eval test="\${$var}" 2>/dev/null - # If $test (the value of the udevinfo var) equals $val + # If $test (the value of the udevadm info var) equals $val # (the value from LOCALDEV_DENY), then increment count of # matches if [ "$test" = "$val" ]; then @@ -180,14 +180,14 @@ verify_device() { fi # Make sure we have a valid FSTYPE - [ -z "${FSTYPE}" ] && FSTYPE="${ID_FS_TYPE}" # Use udevinfo ID_FS_TYPE + [ -z "${FSTYPE}" ] && FSTYPE="${ID_FS_TYPE}" # Use udevadm info ID_FS_TYPE [ "${FSTYPE}" = "swap" ] && exit 1 # Don't mount swap partitions [ -z "${FSTYPE}" ] && exit 1 # That's empty too, die. } add_device() { DEVICENAME="$1" - for link in $($udevinfo -q symlink -n ${DEVICENAME}) ; do + for link in $(udevadm info -q symlink -n ${DEVICENAME}) ; do case $link in cdrom*) LABEL="$link" @@ -254,13 +254,7 @@ esac DEVICENAME=${1##*/} FSTYPE=$2 -if [ -x /sbin/udevadm ]; then - udevinfo="/sbin/udevadm info" -else - udevinfo=udevinfo -fi - -eval "export $($udevinfo -qenv -n ${DEVICENAME}|sed -e 's/=/="/' -e 's/$/"/')" +eval "export $(udevadm info -qenv -n ${DEVICENAME}|sed -e 's/=/="/' -e 's/$/"/')" case $MODE in add*) |