Move gif_interfaces from an IP6 option to a regular IP option.

PR:		26543
Submitted by:	Brooks Davis <brooks@one-eyed-alien.net>
MFC after:	3 weeks

1 files changed, 23 insertions, 0 deletions

diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index fbe8bf3692e9..c4dcb81c04f2 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -129,6 +129,9 @@ network_pass1() {
 		fi
 	done
 
+	# gifconfig
+	network_gif_setup
+
 	# Set up all the network interfaces, calling startup scripts if needed
 	#
 	case ${network_interfaces} in
@@ -751,6 +754,26 @@ network_pass4() {
 	network_pass4_done=YES
 }
 
+network_gif_setup() {
+	case ${gif_interfaces} in
+	[Nn][Oo] | '')
+		;;
+	*)
+		for i in ${gif_interfaces}; do
+			eval peers=\$gifconfig_$i
+			case ${peers} in
+			'')
+				continue
+				;;
+			*)
+				gifconfig $i ${peers}
+				;;
+			esac
+		done
+		;;
+	esac
+}
+
 convert_host_conf() {
     host_conf=$1; shift;
     nsswitch_conf=$1; shift;