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: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Kapshuk 2015-10-12 21:39:44 +03:00 committed by Greg Kroah-Hartman
parent 3e2f5cfb38
commit 12b2732c82
1 changed files with 6 additions and 5 deletions

View File

@ -32,11 +32,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
substr($0,RSTART,RLENGTH))
}'
echo -n "util-linux "
fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
echo -n "mount "
mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$//
mount --version 2>&1 |
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
match($0, /[0-9]+([.]?[0-9]+)+/)
$0 = substr($0,RSTART,RLENGTH)
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}'