patch-2.3.10 linux/scripts/ver_linux

• Lines: 17
• Date: Mon Jul 5 20:49:52 1999
• Orig file: v2.3.9/linux/scripts/ver_linux
• Orig date: Fri Apr 16 08:20:23 1999

diff -u --recursive --new-file v2.3.9/linux/scripts/ver_linux linux/scripts/ver_linux
@@ -21,10 +21,12 @@
 ps --version 2>&1 | awk 'NR==1{print "Procps                ", $NF}'
 mount --version | awk -F\- '{print "Mount                 ", $NF}'
 hostname -V 2>&1 | awk 'NR==1{print "Net-tools             ", $NF}'
+# Kbd needs 'loadkeys -h',
 loadkeys -h 2>&1 | awk \
-'(NR==1 && $3) {ver=$3}
- (NR==2 && $1 ~ /console-tools/) {print "Console-tools         ",$3; done=1}
- END {if (!done) print "Kbd                   ",ver}'
+'(NR==1 && ($3 !~ /option/)) {print "Kbd                   ", $3}'
+# while console-tools needs 'loadkeys -V'.
+loadkeys -V 2>&1 | awk \
+'(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools         ", $3}'
 expr --v | awk '{print "Sh-utils              ", $NF}'
 X=`cat /proc/modules | sed -e "s/ .*$//"`
 echo "Modules Loaded         "$X