diff options
| author | des <des@FreeBSD.org> | 2014-12-01 12:29:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-12-01 12:29:59 +0000 |
| commit | b57dabdefbfa95dbd83f1a420cca9013bd85820f (patch) | |
| tree | e6c666cd2a93992911e373cf500fd18270cae7ac | |
| parent | 48aea3a5cfec4baa4776ec2c7eed854d48e5bc7e (diff) | |
| download | FreeBSD-src-b57dabdefbfa95dbd83f1a420cca9013bd85820f.zip FreeBSD-src-b57dabdefbfa95dbd83f1a420cca9013bd85820f.tar.gz | |
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
| -rw-r--r-- | etc/rc | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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 |
