svn commit: r259040 - stable/10/etc

[Colin Percival]

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"