From owner-svn-src-all@FreeBSD.ORG  Fri Dec  6 20:48:54 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1898F920;
 Fri,  6 Dec 2013 20:48:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 055121F8D;
 Fri,  6 Dec 2013 20:48:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6KmrNS021603;
 Fri, 6 Dec 2013 20:48:53 GMT (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6Kmrdo021602;
 Fri, 6 Dec 2013 20:48:53 GMT (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201312062048.rB6Kmrdo021602@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 6 Dec 2013 20:48:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r259040 - stable/10/etc
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Dec 2013 20:48:54 -0000

Author: cperciva
Date: Fri Dec  6 20:48:53 2013
New Revision: 259040
URL: http://svnweb.freebsd.org/changeset/base/259040

Log:
  MFC r258894: Make rc(8) re-source rc.conf upon receipt of SIGALRM.
  
  The rc system aggressively caches the contents of /etc/rc.conf in order to
  improve boot performance; this produces arguably astonishing (non-)results
  if /etc/rc.conf is modified during the boot process.  This commit provides
  a mechanism for explicitly requesting that rc.conf be reloaded.
  
  Approved by:	re (rodrigc)

Modified:
  stable/10/etc/rc
Directory Properties:
  stable/10/etc/   (props changed)

Modified: stable/10/etc/rc
==============================================================================
--- stable/10/etc/rc	Fri Dec  6 18:41:16 2013	(r259039)
+++ stable/10/etc/rc	Fri Dec  6 20:48:53 2013	(r259040)
@@ -71,6 +71,11 @@ fi
 . /etc/rc.subr
 load_rc_config 'XXX'
 
+# If we receive a SIGALRM, re-source /etc/rc.conf; this allows rc.d
+# scripts to perform "boot-time configuration" including enabling and
+# disabling rc.d scripts which appear later in the boot order.
+trap "_rc_conf_loaded=false; load_rc_config 'XXX'" ALRM
+
 skip="-s nostart"
 if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then
 	skip="$skip -s nojail"