summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrad <brad@openbsd.org>2008-01-17 12:36:33 +0000
committerbrad <brad@openbsd.org>2008-01-17 12:36:33 +0000
commit4bdcd4712a43ba3fd46e673bec5fbf4c6efef69b (patch)
tree2f1968c459ba02000e7251f58a4a0d34962572dd
parentNotify us of NOTE_LINK on mkdir(2) as well. (diff)
downloadwireguard-openbsd-4bdcd4712a43ba3fd46e673bec5fbf4c6efef69b.tar.xz
wireguard-openbsd-4bdcd4712a43ba3fd46e673bec5fbf4c6efef69b.zip
Execute rtsol after turning up trunk(4) and vlan(4) interfaces so they're
taken into consideration for rtsol. ok reyk@ dlg@
-rw-r--r--etc/netstart12
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/netstart b/etc/netstart
index 4b32332e84a..2f37099d734 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.117 2008/01/09 21:38:19 mpf Exp $
+# $OpenBSD: netstart,v 1.118 2008/01/17 12:36:33 brad Exp $
# Strip comments (and leading/trailing whitespace if IFS is set)
# from a file and spew to stdout
@@ -291,6 +291,11 @@ fi
# Refer to hostname.if(5) and bridgename.if(5)
ifmstart "" "trunk vlan carp gif gre pfsync pppoe"
+# The trunk interfaces need to come up first in this list.
+# The vlan interfaces need to come up after trunk.
+# Configure all the carp interfaces which we know about before default route.
+ifmstart "trunk vlan carp"
+
if [ "$ip6kernel" = "YES" -a "x$rtsolif" != "x" ]; then
fw=`sysctl -n net.inet6.ip6.forwarding`
ra=`sysctl -n net.inet6.ip6.accept_rtadv`
@@ -302,11 +307,6 @@ if [ "$ip6kernel" = "YES" -a "x$rtsolif" != "x" ]; then
fi
fi
-# The trunk interfaces need to come up first in this list.
-# The vlan interfaces need to come up after trunk.
-# Configure all the carp interfaces which we know about before default route.
-ifmstart "trunk vlan carp"
-
# /etc/mygate, if it exists, contains the name of my gateway host
# that name must be in /etc/hosts.
[[ -z $dhcpif ]] && stripcom /etc/mygate | while read gw; do