diff options
| -rwxr-xr-x | hooks/live | 5 | ||||
| -rw-r--r-- | scripts/live-helpers | 11 |
2 files changed, 14 insertions, 2 deletions
@@ -148,7 +148,10 @@ else copy_exec /sbin/udevtrigger /sbin copy_exec /sbin/udevsettle /sbin fi -copy_exec /usr/bin/udevinfo /bin +if [ -x /usr/bin/udevinfo ] +then + copy_exec /usr/bin/udevinfo /bin +fi # Program: wget if [ -x /usr/bin/wget ] diff --git a/scripts/live-helpers b/scripts/live-helpers index 70897d6..59bdb4f 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -6,10 +6,19 @@ then export PATH="${PATH}:/usr/lib/klibc/bin" 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 + sys2dev () { sysdev=${1#/sys} - echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})" + echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})" } subdevices () |