diff options
| author |   florian <florian@openbsd.org> | 2015-06-06 13:13:07 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2015-06-06 13:13:07 +0000 |
| commit | 9f32bc0ffaa060751bbdd2a817a19d5f244e84f6 (patch) | |
| tree | cf4fc5729598cfd444607fabf719da96420dadf6 | |
| parent | Enable rtwn(4) on RAMDISK_CD kernels for upgrades. ok deraadt (diff) | |
| download | wireguard-openbsd-9f32bc0ffaa060751bbdd2a817a19d5f244e84f6.tar.xz wireguard-openbsd-9f32bc0ffaa060751bbdd2a817a19d5f244e84f6.zip | |
Allow rtsol keyword in hostname.if(5) with net.inet6.ip6.forwarding=1.
"inet6 autoconf" was working before and rtsol should behave the same.
OK phessler
| -rw-r--r-- | etc/netstart | 11 | ||||
| -rw-r--r-- | share/man/man5/hostname.if.5 | 13 |
2 files changed, 5 insertions, 19 deletions
diff --git a/etc/netstart b/etc/netstart index 9ef974096ef..ca60a55f13b 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.144 2014/12/03 19:55:49 florian Exp $ +# $OpenBSD: netstart,v 1.145 2015/06/06 13:13:07 florian Exp $ # Strip comments (and leading/trailing whitespace if IFS is set) # from a file and spew to stdout @@ -242,13 +242,8 @@ ifmstart "" "trunk svlan vlan carp gif gre pfsync pppoe tun bridge" ifmstart "trunk svlan vlan carp" if [ "$ip6kernel" = "YES" -a "x$rtsolif" != "x" ]; then - fw=`sysctl -n net.inet6.ip6.forwarding` - if [ "x$fw" = "x0" ]; then - echo "IPv6 autoconf:$rtsolif" - ifconfig $rtsolif inet6 autoconf - else - echo "IPv6 autoconf not supported while IPv6 forwarding is enabled" - fi + echo "IPv6 autoconf:$rtsolif" + ifconfig $rtsolif inet6 autoconf fi # Look for default routes in /etc/mygate. diff --git a/share/man/man5/hostname.if.5 b/share/man/man5/hostname.if.5 index d415263da57..53f90bf53da 100644 --- a/share/man/man5/hostname.if.5 +++ b/share/man/man5/hostname.if.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hostname.if.5,v 1.63 2015/03/31 12:47:25 jmc Exp $ +.\" $OpenBSD: hostname.if.5,v 1.64 2015/06/06 13:13:07 florian Exp $ .\" $NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)hosts.5 8.2 (Berkeley) 12/11/93 .\" -.Dd $Mdocdate: March 31 2015 $ +.Dd $Mdocdate: June 6 2015 $ .Dt HOSTNAME.IF 5 .Os .Sh NAME @@ -259,15 +259,6 @@ The literal string .Dq rtsol if the interface is to be configured using IPv6 stateless address autoconfiguration. -This should be used on single interface hosts only, -since the IPv6 specifications are silent about the -behavior on multi-interface hosts. -Also note that the kernel must be configured as a host (i.e. non-router). -Add the following line into -.Xr sysctl.conf 5 : -.Bd -literal -offset indent -net.inet6.ip6.forwarding=0 -.Ed .It Va options Miscellaneous options to set on the interface, e.g., .Dq media 100baseTX mediaopt full-duplex . |