summaryrefslogtreecommitdiffstats
path: root/scripts/ver_linux
diff options
context:
space:
mode:
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>2015-10-12 21:39:52 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 21:55:26 -0700
commitb903fa982db2832d7f402ff00cf30145e8a7fca0 (patch)
treed637e1cd3c5962c4ac7a2a80ef2f6fcbb273c08b /scripts/ver_linux
parent8fb0959822e16a91c23cb41e53693180a2b3389f (diff)
downloadlinux-stable-b903fa982db2832d7f402ff00cf30145e8a7fca0.tar.gz
linux-stable-b903fa982db2832d7f402ff00cf30145e8a7fca0.tar.bz2
linux-stable-b903fa982db2832d7f402ff00cf30145e8a7fca0.zip
ver_linux: ppp, look for numerical input, not field number
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'. Tested on: Oracle Linux Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/ver_linux')
-rwxr-xr-xscripts/ver_linux8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index d5b342eadca0..af5ac824e483 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -94,8 +94,12 @@ awk '/version/{
substr($0,RSTART,RLENGTH))
}'
-pppd --version 2>&1| grep version | awk \
-'NR==1{print "PPP ", $3}'
+pppd --version 2>&1 |
+awk '/version/{
+ match($0, /[0-9]+([.]?[0-9]+)+/)
+ printf("PPP\t\t\t%s\n",
+ substr($0,RSTART,RLENGTH))
+}'
isdnctrl 2>&1 | grep version | awk \
'NR==1{print "isdn4k-utils ", $NF}'