diff options
author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 20:39:53 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 06:55:26 +0200 |
commit | cbb57d10af048d886274129d91f2347d4d48e489 (patch) | |
tree | e9d55ef868afd6fbeafdaa334904f71cb6426251 /scripts | |
parent | ver_linux: ppp, look for numerical input, not field number (diff) | |
download | linux-cbb57d10af048d886274129d91f2347d4d48e489.tar.xz linux-cbb57d10af048d886274129d91f2347d4d48e489.zip |
ver_linux: libc, input redirection to sed fails in some distros
The current implementation has been found not to work across all distros.
The proposed implementation relies on 'sed' to both output the string
'Linux C Library' as well as to open '/proc/self/maps' without having
to use output redirection.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/ver_linux | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index af5ac824e483..909d039284f8 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -107,8 +107,12 @@ isdnctrl 2>&1 | grep version | awk \ showmount --version 2>&1 | grep nfs-utils | awk \ 'NR==1{print "nfs-utils ", $NF}' -echo -n "Linux C Library " -sed -n -e '/^.*\/libc-\([^/]*\)\.so$/{s//\1/;p;q}' < /proc/self/maps +test -r /proc/self/maps && +sed ' + /.*libc-\(.*\)\.so$/!d + s//Linux C Library\t\t\1/ + q +' /proc/self/maps ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \ 'NR==1{print "Dynamic linker (ldd) ", $NF}' |