From 5bcb2f59240cb5501956f2a089ba82e0b8621564 Mon Sep 17 00:00:00 2001 From: Alexander Kapshuk Date: Mon, 12 Oct 2015 21:39:45 +0300 Subject: ver_linux: module-init-tools, 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. Tested on: Gentoo Linux Debian 6.0.10 Oracle Linux Server release 7.1 Signed-off-by: Alexander Kapshuk Signed-off-by: Greg Kroah-Hartman --- scripts/ver_linux | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts/ver_linux') diff --git a/scripts/ver_linux b/scripts/ver_linux index 28e76400d133..7cc74d15e7f1 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -39,7 +39,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ printf("Util-linux\t\t%s\nMount\t\t\t%s\n",$0,$0) }' -depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}' +depmod -V 2>&1 | +awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("Module-init-tools\t%s\n", + substr($0,RSTART,RLENGTH)) +}' tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ 'NR==1 {print "e2fsprogs ", $2}' -- cgit