diff options
| author |   stsp <stsp@openbsd.org> | 2014-07-12 14:39:31 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2014-07-12 14:39:31 +0000 |
| commit | 1d1e64f6a55ddd23a7bf302dd98df40091eaa4a8 (patch) | |
| tree | d4b12bcc66fbfc70c832a595cea0587eeca91695 | |
| parent | Sync with IANA. (diff) | |
| download | wireguard-openbsd-1d1e64f6a55ddd23a7bf302dd98df40091eaa4a8.tar.xz wireguard-openbsd-1d1e64f6a55ddd23a7bf302dd98df40091eaa4a8.zip | |
Fix netstart after autoconf6 change so 'rtsol' lines in hostname.if work again.
found by pelikan@; ok pelikan@ henning@
| -rw-r--r-- | etc/netstart | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/netstart b/etc/netstart index 451f77fa5b1..fac76d5da09 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.140 2014/07/12 10:14:03 robert Exp $ +# $OpenBSD: netstart,v 1.141 2014/07/12 14:39:31 stsp Exp $ # Strip comments (and leading/trailing whitespace if IFS is set) # from a file and spew to stdout @@ -243,12 +243,11 @@ ifmstart "trunk svlan 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` - if [ "x$fw" = "x0" -a "x$ra" = "x1" ]; then + if [ "x$fw" = "x0" ]; then echo "IPv6 autoconf:$rtsolif" rtsol $rtsolif else - echo "WARNING: inconsistent config - check /etc/sysctl.conf for IPv6 autoconf" + echo "IPv6 autoconf not supported while IPv6 forwarding is enabled" fi fi |