svn commit: r275360 - head/etc

[Dag-Erling Smørgrav]

Author: des
Date: Mon Dec  1 12:29:59 2014
New Revision: 275360
URL: https://svnweb.freebsd.org/changeset/base/275360

Log:
  The early-late divider was originally set to mountcritlocal.  Since that
  service does not run in jails, it was necessary to change it to something
  else when jailed, and NETWORKING was arbitrarily chosen.  The divider was
  later moved to FILESYSTEMS when it was introduced, but the logic to change
  it to NETWORKING when jailed remained.  Remove it, as it no longer serves
  any purpose.
  
  PR:		194975
  MFC after:	1 week

Modified:
  head/etc/rc

Modified: head/etc/rc
==============================================================================
--- head/etc/rc	Mon Dec  1 12:17:42 2014	(r275359)
+++ head/etc/rc	Mon Dec  1 12:29:59 2014	(r275360)
@@ -69,19 +69,16 @@ fi
 # and to make the configuration file variables available to rc itself.
 #
 . /etc/rc.subr
-load_rc_config 'XXX'
+load_rc_config
 
 # 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
+trap "_rc_conf_loaded=false; load_rc_config" ALRM
 
 skip="-s nostart"
 if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then
 	skip="$skip -s nojail"
-	if [ "$early_late_divider" = "FILESYSTEMS" ]; then
-		early_late_divider=NETWORKING
-	fi
 	if [ `/sbin/sysctl -n security.jail.vnet` -ne 1 ]; then
 		skip="$skip -s nojailvnet"
 	fi