From 3e03e0cf658a9952db86df4987254fb29cd24ae2 Mon Sep 17 00:00:00 2001
From: mpi <>
Date: Tue, 19 Jul 2016 08:03:01 +0000
Subject: [PATCH] Do not consider tap(4) a special interface and start if
 before other pseudo-interfaces.

This unbreak vlan(4) on top of tap(4) since the refactoring to turn it
MP-safe.

ok claudio@, deraadt@
---
 src/etc/netstart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/netstart b/src/etc/netstart
index edb02bca..62b9ed13 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.168 2016/03/27 20:32:42 sthen Exp $
+#	$OpenBSD: netstart,v 1.169 2016/07/19 08:03:01 mpi Exp $
 
 # Turn off Strict Bourne shell mode.
 set +o sh
@@ -245,7 +245,7 @@ fi
 
 # Configure all the non-loopback interfaces which we know about, but
 # do not start interfaces which must be delayed. Refer to hostname.if(5)
-ifmstart "" "trunk svlan vlan carp gif gre pfsync pppoe tun tap bridge pflow"
+ifmstart "" "trunk svlan vlan carp gif gre pfsync pppoe tun bridge pflow"
 
 # The trunk interfaces need to come up first in this list.
 # The (s)vlan interfaces need to come up after trunk.
@@ -277,7 +277,7 @@ fi
 # require routes to be set. TUN might depend on PPPoE, and GIF or GRE may
 # depend on either of them. PFLOW might bind to ip addresses configured
 # on either of them.
-ifmstart "pppoe tun tap gif gre bridge pflow"
+ifmstart "pppoe tun gif gre bridge pflow"
 
 # Reject 127/8 other than 127.0.0.1.
 route -qn add -net 127 127.0.0.1 -reject >/dev/null