Module Name: src
Committed By: martin
Date: Wed Apr 22 17:55:16 UTC 2020
Modified Files:
src/etc/rc.d [netbsd-9]: network
src/share/man/man5 [netbsd-9]: ifconfig.if.5
src/usr.sbin/rtsold [netbsd-9]: rtsold.8
Log Message:
Pull up following revision(s) (requested by kim in ticket #838):
share/man/man5/ifconfig.if.5: revision 1.20
etc/rc.d/network: revision 1.78 (plus patch)
usr.sbin/rtsold/rtsold.8: revision 1.42
Add an "rtsol" keyword to ifconfig.if for enabling IPv6 RS/RA
Sort SEE ALSO.
Update date
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.76.2.1 src/etc/rc.d/network
cvs rdiff -u -r1.18 -r1.18.18.1 src/share/man/man5/ifconfig.if.5
cvs rdiff -u -r1.37 -r1.37.6.1 src/usr.sbin/rtsold/rtsold.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.76 src/etc/rc.d/network:1.76.2.1
--- src/etc/rc.d/network:1.76 Tue Oct 23 09:25:33 2018
+++ src/etc/rc.d/network Wed Apr 22 17:55:16 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.76 2018/10/23 09:25:33 mrg Exp $
+# $NetBSD: network,v 1.76.2.1 2020/04/22 17:55:16 martin Exp $
#
# PROVIDE: network
@@ -215,7 +215,8 @@ network_start_interfaces()
# For each line from the $ifconfig_xxN variable or the
# /etc/ifconfig.xxN file, we ignore comments and blank lines,
# treat lines beginning with "!" as commands to execute, treat
- # "dhcp" as a special case to invoke dhcpcd, and for any other
+ # "dhcp" as a special case to invoke dhcpcd, treat "rtsol" as
+ # a special case to send a router solicitation, and for any other
# line we run "ifconfig xxN", using each line of the file as the
# arguments for a separate "ifconfig" invocation.
#
@@ -322,6 +323,14 @@ network_start_interfaces()
${dhcpcd_flags} $int
fi
;;
+ rtsol)
+ if ! checkyesno dhcpcd; then
+ /sbin/sysctl -qw \
+ net.inet6.ip6.accept_rtadv=1
+ /sbin/dhcpcd -q6T --nodhcp6 $int \
+ >/dev/null
+ fi
+ ;;
*)
# Pass args to ifconfig. Note
# that args may contain embedded
Index: src/share/man/man5/ifconfig.if.5
diff -u src/share/man/man5/ifconfig.if.5:1.18 src/share/man/man5/ifconfig.if.5:1.18.18.1
--- src/share/man/man5/ifconfig.if.5:1.18 Mon Dec 29 14:22:25 2014
+++ src/share/man/man5/ifconfig.if.5 Wed Apr 22 17:55:16 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: ifconfig.if.5,v 1.18 2014/12/29 14:22:25 wiz Exp $
+.\" $NetBSD: ifconfig.if.5,v 1.18.18.1 2020/04/22 17:55:16 martin Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 18, 2014
+.Dd April 15, 2020
.Dt IFCONFIG.IF 5
.Os
.Sh NAME
Index: src/usr.sbin/rtsold/rtsold.8
diff -u src/usr.sbin/rtsold/rtsold.8:1.37 src/usr.sbin/rtsold/rtsold.8:1.37.6.1
--- src/usr.sbin/rtsold/rtsold.8:1.37 Sun Oct 22 18:09:33 2017
+++ src/usr.sbin/rtsold/rtsold.8 Wed Apr 22 17:55:16 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: rtsold.8,v 1.37 2017/10/22 18:09:33 abhinav Exp $
+.\" $NetBSD: rtsold.8,v 1.37.6.1 2020/04/22 17:55:16 martin Exp $
.\" $KAME: rtsold.8,v 1.17 2001/07/09 22:30:37 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 12, 2014
+.Dd April 15, 2020
.Dt RTSOLD 8
.Os
.\"
