svn commit: r309352 - in head/etc: . defaults

[Warner Losh]

Author: imp
Date: Thu Dec  1 05:16:27 2016
New Revision: 309352
URL: https://svnweb.freebsd.org/changeset/base/309352

Log:
  Finish incomplete comments in prior revision. I was going to fix this
  after I tested it, but didn't.

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.subr

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Thu Dec  1 04:35:43 2016	(r309351)
+++ head/etc/defaults/rc.conf	Thu Dec  1 05:16:27 2016	(r309352)
@@ -21,6 +21,8 @@
 ###  Important initial Boot-time options  ####################
 ##############################################################
 
+# rc_debug can't be set here without interferring with rc.subr's setting it
+# when the kenv variable rc.debug is set.
 #rc_debug="NO"		# Set to YES to enable debugging output from rc.d
 rc_info="NO"		# Enables display of informational messages at boot.
 rc_startmsgs="YES" 	# Show "Starting foo:" messages at boot

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Thu Dec  1 04:35:43 2016	(r309351)
+++ head/etc/rc.subr	Thu Dec  1 05:16:27 2016	(r309352)
@@ -2120,7 +2120,8 @@ _echoonce()
 }
 
 # If the loader env variable rc.debug is set, turn on debugging. rc.conf will
-# still override this, but /etc/defaults/rc.conf.a
+# still override this, but /etc/defaults/rc.conf can't unconditionally set this
+# since it would undo what we've done here.
 if kenv -q rc.debug > /dev/null ; then
 	rc_debug=YES
 fi