Messages in this thread Patch in this message | | | From | Alexander Kapshuk <> | Date | Thu, 1 Oct 2015 21:38:26 +0300 | Subject | [PATCH] ver_linux: util-linux_mount.patch |
| |
The current implementation relies on 'fdformat' to output the version of 'util-linux'. This does not seem to be reliable, as 'fdformat' is not available across all ditros these days.
The proposed implementation uses 'mount', which is a part of 'util-linux', to output both the version of 'util-linux' and 'mount' proper. It also used 'sed' for text processing instead of a combination of 'awk' and 'sed'.
Tested on: Gentoo Linux Debian 6.0.10 Oracle Linux Server release 7.1 Arch Linux
Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com> ---
--- linux/scripts/ver_linux.orig 2015-08-30 21:34:09.000000000 +0300 +++ linux/scripts/ver_linux 2015-09-30 22:35:57.398424443 +0300 @@ -19,11 +19,18 @@
echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"
-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 | +sed ' + /^mount/!d + s/.*util-linux// + s/lib.*// + s/[^0-9\.]//g + s/^/util-linux\t\t/ + h + s/util-linux/mount\t/ + H + g +'
depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}'
| |