From owner-svn-src-head@freebsd.org Thu Dec 1 05:16:28 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE888C6097D; Thu, 1 Dec 2016 05:16:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BAEA825C8; Thu, 1 Dec 2016 05:16:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB15GRti035990; Thu, 1 Dec 2016 05:16:27 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB15GRa2035988; Thu, 1 Dec 2016 05:16:27 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201612010516.uB15GRa2035988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 1 Dec 2016 05:16:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309352 - in head/etc: . defaults X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2016 05:16:29 -0000 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