[PATCH 8/24] ver_linux: e2fsprogs.patch

[PATCH 8/24] ver_linux: e2fsprogs.patch

[Alexander Kapshuk]

'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}'

Re: [PATCH 8/24] ver_linux: e2fsprogs.patch

[Theodore Ts'o]

On Sat, Oct 03, 2015 at 04:23:02PM +0300, Alexander Kapshuk wrote:
> '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.

Instead of making all of these changes, why not just add

PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin

to the beginning of ver_linux?

					- Ted

Re: [PATCH 8/24] ver_linux: e2fsprogs.patch

[Alexander Kapshuk]

On Sun, Oct 4, 2015 at 4:48 AM, Theodore Ts'o <tytso@mit.edu> wrote:
> On Sat, Oct 03, 2015 at 04:23:02PM +0300, Alexander Kapshuk wrote:
>> '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.
>
> Instead of making all of these changes, why not just add
>
> PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
>
> to the beginning of ver_linux?
>
>                                         - Ted

Thanks for your feedback.

My understanding is that $PATH used to be set in ver_linux before. It
had been removed by the commit given below:

2008-07-31kbuild: scripts/ver_linux: don't set PATH
It would have saved both a bug submitter and me a few hours if
scripts/ver_linux had picked the same gcc as the build. Since I can't
see any reason why it fiddles with PATH at all this patch therefore
removes the PATH setting.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

----------------------------------------------------------------------

Perhaps a better approach would be for the user to set their $PATH
appropriately in their shell environment, rather than in ver_linux, as
suggested in the commentary found in ver_linux, instead of ver_linux
trying to guess where the binaries are. Which effectively makes my
other patch, path2bin_test.patch, redundant. Apologies for that.