Module Name:    src
Committed By:   kim
Date:           Sun Oct 11 22:38:48 UTC 2020

Modified Files:
        src/etc/rc.d: network
        src/share/man/man5: ifconfig.if.5

Log Message:
Make "rtsol" functional again.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/etc/rc.d/network
cvs rdiff -u -r1.20 -r1.21 src/share/man/man5/ifconfig.if.5

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.82 src/etc/rc.d/network:1.83
--- src/etc/rc.d/network:1.82	Tue Sep  8 12:52:18 2020
+++ src/etc/rc.d/network	Sun Oct 11 22:38:48 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: network,v 1.82 2020/09/08 12:52:18 martin Exp $
+# $NetBSD: network,v 1.83 2020/10/11 22:38:48 kim Exp $
 #
 
 # PROVIDE: network
@@ -325,7 +325,10 @@ network_start_interfaces()
 				;;
 			rtsol)
 				if ! checkyesno dhcpcd; then
-					/sbin/dhcpcd -n --ipv6rs \
+					/sbin/dhcpcd -n -f /dev/null \
+						--background --persistent \
+						--noipv4 --nodhcp6 \
+						--ipv6ra_noautoconf \
 						${dhcpcd_flags} $int
 				fi
 				;;

Index: src/share/man/man5/ifconfig.if.5
diff -u src/share/man/man5/ifconfig.if.5:1.20 src/share/man/man5/ifconfig.if.5:1.21
--- src/share/man/man5/ifconfig.if.5:1.20	Fri Apr 17 13:36:48 2020
+++ src/share/man/man5/ifconfig.if.5	Sun Oct 11 22:38:48 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ifconfig.if.5,v 1.20 2020/04/17 13:36:48 kim Exp $
+.\"	$NetBSD: ifconfig.if.5,v 1.21 2020/10/11 22:38:48 kim Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
@@ -96,20 +96,21 @@ and any per interface configuration or r
 .Pp
 If the line is equal to
 .Dq rtsol ,
-kernel processing of router advertisements will be enabled and an IPv6
-router solicitation message will be sent out on the interface.
+a dedicated
+.Xr dhcpcd 8
+process will be started for processing received router advertisements
+and sending out IPv6 router solicitation messages on the interface.
 This is useful on networks where default routes can best be learned
 from router advertisements.
 However, if
 .Sy dhcpcd
 has been set to true in
 .Xr rc.conf 5 ,
-it is assumed that
+it is assumed that that
 .Xr dhcpcd 8
-will take care of sending any necessary router solicitation messages and
-processing received router advertisements through its configuration in
-.Xr dhcpcd.conf 5
-instead.
+process will take care of sending any necessary router solicitation
+messages and processing received router advertisements on all
+interfaces, and therefore no per-interface process is started.
 .Pp
 If a line is empty, or starts with
 .Sq # ,

Reply via email to