summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2016-07-19 08:03:01 +0000
committermpi <mpi@openbsd.org>2016-07-19 08:03:01 +0000
commitb360e1775bfdaabc25925f98ef1d7166dd6c32d9 (patch)
tree0076bfa3416c6c443aee91054bae2c5754113784
parentremove bogus attributes on fatal* spotted by guenther@ (diff)
downloadwireguard-openbsd-b360e1775bfdaabc25925f98ef1d7166dd6c32d9.tar.xz
wireguard-openbsd-b360e1775bfdaabc25925f98ef1d7166dd6c32d9.zip
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@
-rw-r--r--etc/netstart6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/netstart b/etc/netstart
index edb02bca875..62b9ed13455 100644
--- a/etc/netstart
+++ b/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