diff options
| author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 20:40:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 06:55:26 +0200 |
| commit | 1245b7ec0f8cb223a252c71ed39c33c005c0631c (patch) | |
| tree | 51ae04317880c24c39c188104b3c99363cc7f487 /scripts | |
| parent | ver_linux: sh-utils, look for numerical input, not field number (diff) | |
| download | linux-1245b7ec0f8cb223a252c71ed39c33c005c0631c.tar.xz linux-1245b7ec0f8cb223a252c71ed39c33c005c0631c.zip | |
ver_linux: use 'udevadm', instead of 'udevinfo'
'udevinfo' no longer seems to be available across various
distros. 'udevadm' seems to be the currently valid way to look up the
'udev' version.
Tested on:
Gentoo Linux
Debian 6.0.10
Oracle Linux Server release 7.1
Rely on regex to find the version number, rather than rely on numerical input to be found in a particular input field.
Proposed implementation also eliminates the necessity to invoke 'grep' + 'awk'.
Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ver_linux | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index 1c6ec2244ae8..f839be33bcb4 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -164,7 +164,12 @@ awk '/^expr/{ substr($0,RSTART,RLENGTH)) }' -udevinfo -V 2>&1 | grep version | awk '{print "udev ", $3}' +udevadm --version 2>&1 | +awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("Udev\t\t\t%s\n", + substr($0,RSTART,RLENGTH)) +}' iwconfig --version 2>&1 | awk \ '(NR==1 && ($3 == "version")) {print "wireless-tools ",$4}' |