From c8703a911ad83b0f513197689a88ec949871f7ea Mon Sep 17 00:00:00 2001
From: ume <ume@FreeBSD.org>
Date: Thu, 18 Jul 2002 05:00:16 +0000
Subject: be able to configure to run an IPv6 routing daemon even on an end
 node.

Requested by:	Masachika ISHIZUKA <ishizuka@ish.org>
MFC after:	1 week
---
 etc/defaults/rc.conf  |  2 ++
 etc/rc.d/network_ipv6 | 21 +++++++++++----------
 etc/rc.network6       | 21 +++++++++++----------
 3 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'etc')

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index cfb3de8..c517883 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -265,6 +265,8 @@ ipv6_router="/usr/sbin/route6d"	# Name of IPv6 routing daemon.
 ipv6_router_flags=""		# Flags to IPv6 routing daemon.
 #ipv6_router_flags="-l"		# Example for route6d with only IPv6 site local
 				# addrs.
+#ipv6_router_flags="-q"		# If you want to run a routing daemon on an end
+				# node, you should stop advertisement.
 #ipv6_network_interfaces="ed0 ep0"	# Examples for router
 					# or static configuration for end node.
 					# Choose correct prefix value.
diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index 406bde6..3e9a7c3 100644
--- a/etc/rc.d/network_ipv6
+++ b/etc/rc.d/network_ipv6
@@ -201,18 +201,19 @@ network6_pass1() {
 	# setup faith
 	network6_faith_setup
 
-	case ${ipv6_gateway_enable} in
+	# ipv6_router
+	case ${ipv6_router_enable} in
 	[Yy][Ee][Ss])
-		# ipv6_router
-		case ${ipv6_router_enable} in
-		[Yy][Ee][Ss])
-			if [ -x ${ipv6_router} ]; then
-				echo -n " ${ipv6_router}"
-				${ipv6_router} ${ipv6_router_flags}
-			fi
-			;;
-		esac
+		if [ -x ${ipv6_router} ]; then
+			echo -n " ${ipv6_router}"
+			${ipv6_router} ${ipv6_router_flags}
+		fi
+		;;
+	esac
+
 
+	case ${ipv6_gateway_enable} in
+	[Yy][Ee][Ss])
 		# rtadvd
 		# This should enabled with a great care.
 		# You may want to fine-tune /etc/rtadvd.conf.
diff --git a/etc/rc.network6 b/etc/rc.network6
index 406bde6..3e9a7c3 100644
--- a/etc/rc.network6
+++ b/etc/rc.network6
@@ -201,18 +201,19 @@ network6_pass1() {
 	# setup faith
 	network6_faith_setup
 
-	case ${ipv6_gateway_enable} in
+	# ipv6_router
+	case ${ipv6_router_enable} in
 	[Yy][Ee][Ss])
-		# ipv6_router
-		case ${ipv6_router_enable} in
-		[Yy][Ee][Ss])
-			if [ -x ${ipv6_router} ]; then
-				echo -n " ${ipv6_router}"
-				${ipv6_router} ${ipv6_router_flags}
-			fi
-			;;
-		esac
+		if [ -x ${ipv6_router} ]; then
+			echo -n " ${ipv6_router}"
+			${ipv6_router} ${ipv6_router_flags}
+		fi
+		;;
+	esac
+
 
+	case ${ipv6_gateway_enable} in
+	[Yy][Ee][Ss])
 		# rtadvd
 		# This should enabled with a great care.
 		# You may want to fine-tune /etc/rtadvd.conf.
-- 
cgit v1.1