From 12b3cd17835b2963440aab476bf557b651cd5cd8 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 20 Nov 2001 12:51:12 +0000
Subject: [PATCH] The rtsol must be done before the alias processing.

PR:		conf/31366
Submitted by:	gshapiro
MFC after:	1 week
---
 etc/rc.d/network_ipv6 | 21 ++++++++++++---------
 etc/rc.network6       | 21 ++++++++++++---------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index 1dc8473e0d8..37dfae59521 100644
--- a/etc/rc.d/network_ipv6
+++ b/etc/rc.d/network_ipv6
@@ -320,15 +320,6 @@ network6_interface_setup() {
 			rtsol_interface=no
 			ifconfig $i inet6 ${ipv6_ifconfig} alias
 		fi
-		alias=0
-		while : ; do
-			eval ipv6_ifconfig=\$ipv6_ifconfig_${i}_alias${alias}
-			if [ -z "${ipv6_ifconfig}" ]; then
-				break;
-			fi
-			ifconfig $i inet6 ${ipv6_ifconfig} alias
-			alias=$((${alias} + 1))
-		done
 
 		if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ]
 		then
@@ -354,6 +345,18 @@ network6_interface_setup() {
 		ifconfig $1 up
 		rtsol $1
 	fi
+
+	for i in $interfaces; do
+		alias=0
+		while : ; do
+			eval ipv6_ifconfig=\$ipv6_ifconfig_${i}_alias${alias}
+			if [ -z "${ipv6_ifconfig}" ]; then
+				break;
+			fi
+			ifconfig $i inet6 ${ipv6_ifconfig} alias
+			alias=$((${alias} + 1))
+		done
+	done
 }
 
 network6_stf_setup() {
diff --git a/etc/rc.network6 b/etc/rc.network6
index 1dc8473e0d8..37dfae59521 100644
--- a/etc/rc.network6
+++ b/etc/rc.network6
@@ -320,15 +320,6 @@ network6_interface_setup() {
 			rtsol_interface=no
 			ifconfig $i inet6 ${ipv6_ifconfig} alias
 		fi
-		alias=0
-		while : ; do
-			eval ipv6_ifconfig=\$ipv6_ifconfig_${i}_alias${alias}
-			if [ -z "${ipv6_ifconfig}" ]; then
-				break;
-			fi
-			ifconfig $i inet6 ${ipv6_ifconfig} alias
-			alias=$((${alias} + 1))
-		done
 
 		if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ]
 		then
@@ -354,6 +345,18 @@ network6_interface_setup() {
 		ifconfig $1 up
 		rtsol $1
 	fi
+
+	for i in $interfaces; do
+		alias=0
+		while : ; do
+			eval ipv6_ifconfig=\$ipv6_ifconfig_${i}_alias${alias}
+			if [ -z "${ipv6_ifconfig}" ]; then
+				break;
+			fi
+			ifconfig $i inet6 ${ipv6_ifconfig} alias
+			alias=$((${alias} + 1))
+		done
+	done
 }
 
 network6_stf_setup() {