Messages in this thread Patch in this message | | | From | Alexander Kapshuk <> | Date | Sat, 3 Oct 2015 16:23:02 +0300 | Subject | [PATCH 8/24] ver_linux: e2fsprogs.patch |
| |
'tune2fs' is located in varying places depending on the distro. Current implementation output on distros where 'tune2fs' is found at a location that is not available in the PATH for the regular user, e.g. '/sbin', will have nothing to display. While running 'ver_linux' as user 'root' should be OK.
Proposed implementation, makes provision for locating 'tune2fs', making it more reliable across the various distros.
Tested on: Gentoo Linux Debian 6.0.10 Oracle Linux Server release 7.1 Arch Linux openSuSE 13.2
Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com> --- --- linux/scripts/ver_linux.orig 2015-10-03 13:41:57.118790241 +0300 +++ linux/scripts/ver_linux 2015-10-03 13:52:04.635699263 +0300 @@ -27,8 +27,14 @@
depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}'
-tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ -'NR==1 {print "e2fsprogs ", $2}' +test -x "$tune2fs" && +$tune2fs 2>&1 | +sed ' + /^tune2fs/!d + s/-.*// + s/[^0-9\.]*// + s/.*[ \t]\(.*\)[ \t].*/e2fsprogs\t\t\1/ +'
fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \ 'NR==1 {print "jfsutils ", $3}'
| |