aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2016-11-04 17:02:42 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2016-11-04 17:02:42 +0000
commite98bb55f0b6a228c63ff5d11cde0d5634ce48bfd (patch)
tree524c525d02eae8ac110bb3038701776a22a134ad
parentb575f33f67cfb4592fa534c7e874cfe3b80a8624 (diff)
Notes
-rw-r--r--bin/freebsd-version/freebsd-version.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/freebsd-version/freebsd-version.sh.in b/bin/freebsd-version/freebsd-version.sh.in
index a830d264916b..16034104d5cf 100644
--- a/bin/freebsd-version/freebsd-version.sh.in
+++ b/bin/freebsd-version/freebsd-version.sh.in
@@ -36,7 +36,7 @@ USERLAND_VERSION="@@REVISION@@-@@BRANCH@@"
: ${LOADER_CONF_FILES:=$LOADER_DIR/defaults/loader.conf $LOADER_DIR/loader.conf $LOADER_DIR/loader.conf.local}
LOADER_RE1='^\([A-Z_a-z][0-9A-Z_a-z]*=[-./0-9A-Z_a-z]\{1,\}\).*$'
LOADER_RE2='^\([A-Z_a-z][0-9A-Z_a-z]*="[-./0-9A-Z_a-z]\{1,\}"\).*$'
-KERNEL_RE='^@(#)@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$'
+KERNEL_RE='^@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$'
progname=$(basename $0)
@@ -67,7 +67,7 @@ kernel_version() {
if [ ! -f "$kernfile" -o ! -r "$kernfile" ] ; then
error "unable to locate kernel"
fi
- strings "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p"
+ what -qs "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p"
}
#