From 57a5c786db6d85bbef6a76b48eb984ce1649ffe4 Mon Sep 17 00:00:00 2001
From: brad <>
Date: Thu, 17 Jan 2008 12:36:33 +0000
Subject: [PATCH] Execute rtsol after turning up trunk(4) and vlan(4)
 interfaces so they're taken into consideration for rtsol.

ok reyk@ dlg@
---
 src/etc/netstart | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/etc/netstart b/src/etc/netstart
index 4b32332e..2f37099d 100644
--- a/src/etc/netstart
+++ b/src/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