From b02bbc72e9d77922bcbae48fd682aaac66122c44 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 4 May 2014 00:19:46 +0000
Subject: display Starting/Stopping service only when its enabler var is not NO

also, show only the basename and do not leak rcquiet to child env
---
 package/base-files/src/etc/init.d/rcK | 22 ++++++++++++++++++----
 package/base-files/src/etc/init.d/rcS | 22 ++++++++++++++++++----
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK
index 9859f300a..8bff46cc6 100755
--- a/package/base-files/src/etc/init.d/rcK
+++ b/package/base-files/src/etc/init.d/rcK
@@ -1,18 +1,32 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 : ${rcquiet=0}
+if test x"$rcquiet" = x"0" && sh -n /etc/rc.conf >/dev/null 2>&1; then
+	. /etc/rc.conf
+	unset rcquiet
+	rcquiet=0
+else
+	unset rcquiet
+	rcquiet=1
+fi
 {
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -rnk2 | \
 	    while read line; do
-		test x"$rcquiet" = x"0" && echo -n "Stopping ${line%%:*}... "
+		rcenabled=NO
+		rcname=${line%%:*}
+		rcname=${rcname##*/}
+		test x"$rcquiet" = x"0" && eval 'rcenabled=${'"${rcname}"':-NO}'
+		test x"$rcenabled" = x"NO" || echo -n "Stopping ${rcname}... "
 		sh ${line%%:*} autostop
 		rc=$?
-		case $rcquiet:$rc in
-		(0:0)
+		case $rcenabled:$rc in
+		(NO:*)
+			;;
+		(*:0)
 			echo done.
 			;;
-		(0:*)
+		(*:*)
 			echo "failed ($rc)."
 			;;
 		esac
diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS
index 77137e6d3..3a58d4d17 100755
--- a/package/base-files/src/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
@@ -7,18 +7,32 @@ ln -s /proc/self/fd/2 /dev/stderr
 echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 : ${rcquiet=0}
+if test x"$rcquiet" = x"0" && sh -n /etc/rc.conf >/dev/null 2>&1; then
+	. /etc/rc.conf
+	unset rcquiet
+	rcquiet=0
+else
+	unset rcquiet
+	rcquiet=1
+fi
 {
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -nk2 | \
 	    while read line; do
-		test x"$rcquiet" = x"0" && echo -n "Starting ${line%%:*}... "
+		rcenabled=NO
+		rcname=${line%%:*}
+		rcname=${rcname##*/}
+		test x"$rcquiet" = x"0" && eval 'rcenabled=${'"${rcname}"':-NO}'
+		test x"$rcenabled" = x"NO" || echo -n "Starting ${rcname}... "
 		sh ${line%%:*} autostart
 		rc=$?
-		case $rcquiet:$rc in
-		(0:0)
+		case $rcenabled:$rc in
+		(NO:*)
+			;;
+		(*:0)
 			echo done.
 			;;
-		(0:*)
+		(*:*)
 			echo "failed ($rc)."
 			;;
 		esac
-- 
cgit v1.2.3