svn commit: r204421 - in stable/8/etc: . defaults rc.d

[Hajimu UMEMOTO]

Author: ume
Date: Sat Feb 27 18:19:13 2010
New Revision: 204421
URL: http://svn.freebsd.org/changeset/base/204421

Log:
  MFC r203433:
  
  Add rc.d script for the rtsold(8) daemon.
  
  The rtsol(8) handles just one RA then exit.  So, the OtherConfig flag
  may not be handled well by rtsol(8) in the environment where there are
  multiple RA servers on the segment.  In such case, rtsold(8) will be
  your friend.

Added:
  stable/8/etc/rc.d/rtsold
     - copied unchanged from r203433, head/etc/rc.d/rtsold
Modified:
  stable/8/etc/defaults/rc.conf
  stable/8/etc/network.subr
  stable/8/etc/rc.d/Makefile
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/defaults/rc.conf
==============================================================================
--- stable/8/etc/defaults/rc.conf	Sat Feb 27 18:00:57 2010	(r204420)
+++ stable/8/etc/defaults/rc.conf	Sat Feb 27 18:19:13 2010	(r204421)
@@ -450,6 +450,10 @@ ipv6_default_interface="NO"	# Default ou
 				# Now this works only for IPv6 link local
 				# multicast addrs.
 rtsol_flags=""			# Flags to IPv6 router solicitation.
+rtsold_enable="NO"		# Set to YES to enable an IPv6 router
+				# solicitation daemon.
+rtsold_flags="-a"		# Flags to an IPv6 router solicitation
+				# daemon.
 rtadvd_enable="NO"		# Set to YES to enable an IPv6 router
 				# advertisement daemon. If set to YES,
 				# this router becomes a possible candidate

Modified: stable/8/etc/network.subr
==============================================================================
--- stable/8/etc/network.subr	Sat Feb 27 18:00:57 2010	(r204420)
+++ stable/8/etc/network.subr	Sat Feb 27 18:19:13 2010	(r204421)
@@ -985,7 +985,9 @@ network6_interface_setup()
 		sysctl net.inet6.ip6.accept_rtadv=1
 		set ${rtsol_interfaces}
 		ifconfig $1 up
-		rtsol ${rtsol_flags} $1
+		if ! checkyesno rtsold_enable; then
+			rtsol ${rtsol_flags} $1
+		fi
 	fi
 
 	for i in $interfaces; do

Modified: stable/8/etc/rc.d/Makefile
==============================================================================
--- stable/8/etc/rc.d/Makefile	Sat Feb 27 18:00:57 2010	(r204420)
+++ stable/8/etc/rc.d/Makefile	Sat Feb 27 18:19:13 2010	(r204421)
@@ -30,7 +30,7 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	powerd power_profile ppp pppoed pwcheck \
 	quota \
 	random rarpd resolv rfcomm_pppd_server root \
-	route6d routed routing rpcbind rtadvd rwho \
+	route6d routed routing rpcbind rtadvd rtsold rwho \
 	savecore sdpd securelevel sendmail \
 	serial sppp statd static_arp swap1 \
 	syscons sysctl syslogd \

Copied: stable/8/etc/rc.d/rtsold (from r203433, head/etc/rc.d/rtsold)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/etc/rc.d/rtsold	Sat Feb 27 18:19:13 2010	(r204421, copy of r203433, head/etc/rc.d/rtsold)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: rtsold
+# REQUIRE: netif
+# BEFORE: NETWORKING
+# KEYWORD: nojail
+
+. /etc/rc.subr
+
+name="rtsold"
+rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+start_postcmd="rtsold_poststart"
+
+rtsold_poststart()
+{
+	# wait for DAD
+	sleep $(($(${SYSCTL_N} net.inet6.ip6.dad_count) + 1))
+}
+
+load_rc_config $name
+run_rc_command "$1"