Module Name: src
Committed By: snj
Date: Sat Jul 8 16:06:01 UTC 2017
Modified Files:
src/usr.sbin/service [netbsd-7]: service
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1427):
usr.sbin/service/service: revision 1.8
Only match first instance of name and rcvar in file.
To generate a diff of this commit:
cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/usr.sbin/service/service
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/service/service
diff -u src/usr.sbin/service/service:1.7.2.2 src/usr.sbin/service/service:1.7.2.3
--- src/usr.sbin/service/service:1.7.2.2 Tue Apr 21 05:22:58 2015
+++ src/usr.sbin/service/service Sat Jul 8 16:06:00 2017
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: service,v 1.7.2.2 2015/04/21 05:22:58 snj Exp $
+# $NetBSD: service,v 1.7.2.3 2017/07/08 16:06:00 snj Exp $
# service -- run or list system services
#
# Taken from FreeBSD: releng/10.1/usr.sbin/service/service.sh 268098
@@ -84,8 +84,8 @@ if [ -n "${ENABLED}" ]; then
_rc_files | $flt | while read file
do
if grep -q ^rcvar "$file"; then
- eval $( grep ^name= "$file" )
- eval $( grep ^rcvar "$file" )
+ eval $( grep -m 1 ^name= "$file" )
+ eval $( grep -m 1 ^rcvar "$file" )
if [ -n "${rcvar}" ]; then
load_rc_config ${rcvar}
checkyesno ${rcvar} 2>/dev/null && echo ${file}
