Remove rcconf.sh from /etc/rc.d, and instead load the configuration

as part of rc. Doing this, and the sourcing of rc.subr after we have
determined if we are booting diskless (and correspondingly run
rc.initdiskless if necessary) are safe, and actually allow fewer files
to be needed on the diskless box. This also allows variables from
the configuration to be available to rc itself, such as ...

Add a variable to rc.conf, early_late_divider, which designates the
script which separates the early and late stages of the boot process.
Default this to mountcritlocal, and add text to etc/defaults/rc.conf,
rc.conf(5) and diskless(8) which describes how and why one might want
to change this.

Reviewed by:	brooks

5 files changed, 1 insertions, 16 deletions

diff --git a/etc/rc.d/devfs b/etc/rc.d/devfs
index d74e988..e7a6071 100644
--- a/etc/rc.d/devfs
+++ b/etc/rc.d/devfs
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: devfs
-# REQUIRE: rcconf mountcritremote
+# REQUIRE: mountcritremote
 # BEFORE:  SERVERS securelevel
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index 7697eab..cc049ec 100644
--- a/etc/rc.d/dumpon
+++ b/etc/rc.d/dumpon
@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: dumpon
-# REQUIRE: rcconf
 # BEFORE: disks savecore initrandom
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom
index 2c8dc52..a336cb8 100644
--- a/etc/rc.d/initrandom
+++ b/etc/rc.d/initrandom
@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: initrandom
-# REQUIRE: rcconf
 # BEFORE: disks
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/rcconf.sh b/etc/rc.d/rcconf.sh
deleted file mode 100644
index fdcd95b..0000000
--- a/etc/rc.d/rcconf.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: rcconf
-# BEFORE:  disks initrandom
-
-. /etc/rc.subr
-
-echo "Loading configuration files."
-load_rc_config 'XXX'
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index d2d6371..08e775f 100644
--- a/etc/rc.d/resolv
+++ b/etc/rc.d/resolv
@@ -28,7 +28,6 @@
 #
 
 # PROVIDE: resolv
-# REQUIRE: rcconf
 # KEYWORD: nojail
 
 . /etc/rc.subr