From da9ae504397cf8ef970c4e4633e391a1f153054b Mon Sep 17 00:00:00 2001
From: ume <ume@FreeBSD.org>
Date: Wed, 30 Sep 2009 14:58:10 +0000
Subject: [PATCH] Don't do an IPv6 operation when the kernel doesn't have an
 IPv6 support.

Reported by:	Alexander Best <alexbestms__at__math.uni-muenster.de>
Confirmed by:	Paul B. Mahol <onemda__at__gmail.com>,
		Alexander Best <alexbestms__at__math.uni-muenster.de>
---
 etc/rc.d/netoptions | 13 ++++++++-----
 etc/rc.d/routing    |  8 ++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 593333a74005..2d21525d50c5 100755
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -9,6 +9,7 @@
 # KEYWORD: nojail
 
 . /etc/rc.subr
+. /etc/network.subr
 
 name="netoptions"
 start_cmd="netoptions_start"
@@ -66,11 +67,13 @@ netoptions_start()
 		;;
 	esac
 
-	if checkyesno ipv6_ipv4mapping; then
-		${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null
-	else
-		echo -n " no-ipv4-mapped-ipv6"
-		${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null
+	if afexists inet6; then
+		if checkyesno ipv6_ipv4mapping; then
+			${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null
+		else
+			echo -n " no-ipv4-mapped-ipv6"
+			${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null
+		fi
 	fi
 
 	[ -n "${_netoptions_initdone}" ] && echo '.'
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 05f6013635a1..3b399882f967 100755
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -51,7 +51,9 @@ static_start()
 		;;
 	*)
 		do_static inet add
-		do_static inet6 add
+		if afexists inet6; then
+			do_static inet6 add
+		fi
 		do_static atm add
 		;;
 	esac
@@ -74,7 +76,9 @@ static_stop()
 		;;
 	*)
 		do_static inet delete
-		do_static inet6 delete
+		if afexists inet6; then
+			do_static inet6 delete
+		fi
 		do_static atm delete
 		;;
 	esac