File 0001-ifup-dhcp-fix-for-check-whether-ipv6-is-en... of Package sysconfig

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-ifup-dhcp-fix-for-check-whether-ipv6-is-enabled.patch of Package sysconfig (Revision c87d899f7b6e32b3f30f3b62f5020ed0)

Currently displaying revision c87d899f7b6e32b3f30f3b62f5020ed0 , Show latest

From a83f8cb7cbca6ca67cbba174eb22a2e51972ec16 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.de>
Date: Mon, 12 Jul 2010 13:16:06 +0200
Subject: [PATCH] ifup-dhcp: fix for check whether ipv6 is enabled

Fixed check whether ipv6 is enabled or not in /sbin/ifup-dhcp to
avoid dhcpv6 client start in case the interface is configured to
start both, dhcpv4 and dhcpv6 clients (bnc#616765).

Signed-off-by: Marius Tomaschewski <mt@suse.de>

diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp
index a16a748..3c32517 100755
--- a/scripts/ifup-dhcp
+++ b/scripts/ifup-dhcp
@@ -199,7 +199,11 @@ case "$ACTION" in
 	;;
 	*)
 		HAVE_IPv6=yes
-		test -d /proc/sys/net/ipv6 || HAVE_IPv6=no
+		test -d /proc/sys/net/ipv6 && {
+			val1=`cat "/proc/sys/net/ipv6/conf/$INTERFACE/disable_ipv6" 2>/dev/null`
+			val2=`cat "/proc/sys/net/ipv6/conf/all/disable_ipv6" 2>/dev/null`
+			test "x$val1" = x1 -o "x$val2" = x1 && HAVE_IPv6=no
+		} || HAVE_IPv6=no
 
 		clients=0
 		bootprotos=(${BOOTPROTOS[@]})
@@ -256,7 +260,7 @@ case "$ACTION" in
 					if [ "x$explicit_dhcp6" = "xyes" ] ; then
 						if [ "x$HAVE_IPv6" = xyes ] ; then
 							print_mesg err_mesg "DHCP6 client is not available."
-							print_mesg err_mesg "      Please install 'dhcpv6' package'"
+							print_mesg err_mesg "      Please install 'dhcpv6' or 'dhcp-client' package'"
 						else
 							print_mesg err_mesg "DHCP6 disabled - no IPv6 support"
 						fi
@@ -265,7 +269,7 @@ case "$ACTION" in
 				*)
 					DHCLIENT6=""
 					print_mesg err_mesg "DHCP6 client unknown/unsupported: $DHCLIENT6_BIN"
-					print_mesg err_mesg "      Please install the 'dhcpv6' package"
+					print_mesg err_mesg "      Please install the 'dhcpv6' or 'dhcp-client' package"
 				;;
 				esac
 			;;
-- 
1.7.1

Places

File 0001-ifup-dhcp-fix-for-check-whether-ipv6-is-enabled.patch of Package sysconfig (Revision c87d899f7b6e32b3f30f3b62f5020ed0)

Places