diff options
| author | mtm <mtm@FreeBSD.org> | 2003-08-20 06:50:34 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2003-08-20 06:50:34 +0000 |
| commit | 48989a0f53c9645101916ec7fb99ce3da939cf00 (patch) | |
| tree | b9b36c8ff903698029b3b817c88ad78c5714f00e /etc | |
| parent | 876b45a0a8f131c70ffdde1ab9d44fb0a50ed915 (diff) | |
| download | FreeBSD-src-48989a0f53c9645101916ec7fb99ce3da939cf00.zip FreeBSD-src-48989a0f53c9645101916ec7fb99ce3da939cf00.tar.gz | |
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 2 | ||||
| -rw-r--r-- | etc/rc.subr | 12 |
2 files changed, 9 insertions, 5 deletions
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 } # |
