Browse Source

move /usr and var remounting (nfs diskless case...) earlier, so that

unwind can be started (silently) before pf is configured (for those
few weirdos who use hostnames in pf.conf...).  Other unidentified concerns
may be improved by this startup re-ordering, so let's give it a try.
discussed with florian.
OPENBSD_6_7
deraadt 5 years ago
parent
commit
c5e229f62e
1 changed files with 7 additions and 5 deletions
  1. +7
    -5
      src/etc/rc

+ 7
- 5
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.541 2019/11/10 15:02:36 naddy Exp $
# $OpenBSD: rc,v 1.542 2019/11/11 04:55:37 deraadt Exp $
# System startup script run by init on autoboot or after single-user. # System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the # Output and error are redirected to console by init, and the console is the
@ -446,6 +446,11 @@ ifconfig -g carp carpdemote 128
sh /etc/netstart sh /etc/netstart
mount -s /usr >/dev/null 2>&1
mount -s /var >/dev/null 2>&1
start_daemon unwind >/dev/null 2>&1
# Load pf rules and bring up pfsync interface. # Load pf rules and bring up pfsync interface.
if [[ $pf != NO ]]; then if [[ $pf != NO ]]; then
if [[ -f /etc/pf.conf ]]; then if [[ -f /etc/pf.conf ]]; then
@ -456,9 +461,6 @@ if [[ $pf != NO ]]; then
fi fi
fi fi
mount -s /usr >/dev/null 2>&1
mount -s /var >/dev/null 2>&1
random_seed random_seed
reorder_libs reorder_libs
@ -474,7 +476,7 @@ dmesg >/var/run/dmesg.boot
make_keys make_keys
echo -n 'starting early daemons:' echo -n 'starting early daemons:'
start_daemon syslogd ldattach pflogd nsd rebound unwind unbound ntpd
start_daemon syslogd ldattach pflogd nsd rebound unbound ntpd
start_daemon iscsid isakmpd iked sasyncd ldapd npppd start_daemon iscsid isakmpd iked sasyncd ldapd npppd
echo '.' echo '.'


Loading…
Cancel
Save