From 48989a0f53c9645101916ec7fb99ce3da939cf00 Mon Sep 17 00:00:00 2001
From: mtm <mtm@FreeBSD.org>
Date: Wed, 20 Aug 2003 06:50:34 +0000
Subject: o Reduce rc(8) startup clutter by turning the informational messages 
  off by default. o Apparently the routine displaying the informational
 messages wasn't   checking its knob in rc.conf, so fix that as well.

Requested by:	obrien
---
 etc/defaults/rc.conf |  2 +-
 etc/rc.subr          | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'etc')

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index be380f2..8a0907d 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -20,7 +20,7 @@
 ##############################################################
 
 rc_debug="NO"		# Set to YES to enable debugging output from rc.d
-rc_info="YES"		# Enables display of informational messages at boot.
+rc_info="NO"		# Enables display of informational messages at boot.
 rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown
 swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
 apm_enable="NO"		# Set to YES to enable APM BIOS functions (or NO).
diff --git a/etc/rc.subr b/etc/rc.subr
index c45938c..34c4816 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -924,10 +924,14 @@ warn()
 #
 info()
 {
-	if [ -x /usr/bin/logger ]; then
-		logger "$0: INFO: $*"
-	fi
-	echo "$0: INFO: $*"
+	case ${rc_info} in
+	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+		if [ -x /usr/bin/logger ]; then
+			logger "$0: INFO: $*"
+		fi
+		echo "$0: INFO: $*"
+		;;
+	esac
 }
 
 #
-- 
cgit v1.1