[PATCH 6/24] ver_linux: util-linux_mount.patch

[Alexander Kapshuk]

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' 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@xxxxxxxxx>
---
--- linux/scripts/ver_linux.orig    2015-10-03 13:41:57.118790241 +0300
+++ linux/scripts/ver_linux    2015-10-03 13:50:58.924682573 +0300
@@ -19,11 +19,19 @@

 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/\)$//
+test -x "$mount" &&
+$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}'
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/