Commit 12b2732c authored by Alexander Kapshuk's avatar Alexander Kapshuk Committed by Greg Kroah-Hartman

ver_linux: util-linux, 'fdformat' not ubiquitous any longer

The current implementation relies on 'fdformat' to output the version of
'util-linux'. This does not seem to be reliable any longer, as 'fdformat'
does not seem to come preinstalled in all ditros these days.

The proposed implementation uses 'mount' to output both the version
of 'util-linux' and 'mount' proper, as 'mount' is also a part of the
'util-linux' package.

Tested on:
Gentoo Linux
Debian 6.0.10
Oracle Linux Server release 7.1

Rely on regex to find the version number, rather than a field number.
Signed-off-by: default avatarAlexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e2f5cfb
...@@ -32,11 +32,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ ...@@ -32,11 +32,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
substr($0,RSTART,RLENGTH)) substr($0,RSTART,RLENGTH))
}' }'
echo -n "util-linux " mount --version 2>&1 |
fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$// awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
match($0, /[0-9]+([.]?[0-9]+)+/)
echo -n "mount " $0 = substr($0,RSTART,RLENGTH)
mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$// 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 'NR==1 {print "module-init-tools ",$NF}'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment