summaryrefslogtreecommitdiff
path: root/etc/rc
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2022-06-26 08:08:24 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2022-06-26 08:08:24 +0000
commit9a7232a37d96f5fe2b4274e1b596ea85eeceb900 (patch)
tree47e95800b75827f9496de127cbe1f7174d400a2e /etc/rc
parentba8747ed471be15c8d0dc341d41308e88035165c (diff)
Start network auto configuration daemons earlier so that tunnel
interfaces can depend on dhcp or slaac. dhcpleased needs /var mounted so pull that up, we do not support /var on nfs. With & OK deraadt, earlier version OK sthen
Diffstat (limited to 'etc/rc')
-rw-r--r--etc/rc11
1 files changed, 6 insertions, 5 deletions
diff --git a/etc/rc b/etc/rc
index 480e55f07c4..a0325c74508 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.556 2022/01/17 04:12:15 jsg Exp $
+# $OpenBSD: rc,v 1.557 2022/06/26 08:08:23 florian Exp $
# 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
@@ -441,7 +441,10 @@ fill_baddynamic tcp
sysctl_conf
-start_daemon slaacd >/dev/null 2>&1
+mount -s /var >/dev/null 2>&1 # cannot be on NFS
+mount -s /var/log >/dev/null 2>&1 # cannot be on NFS
+
+start_daemon slaacd dhcpleased resolvd >/dev/null 2>&1
echo 'starting network'
@@ -452,10 +455,8 @@ ifconfig -g carp carpdemote 128
sh /etc/netstart
mount -s /usr >/dev/null 2>&1
-mount -s /var >/dev/null 2>&1
-mount -s /var/log >/dev/null 2>&1
-start_daemon dhcpleased unwind resolvd >/dev/null 2>&1
+start_daemon unwind >/dev/null 2>&1
random_seed