Attachment 399687 Details for Bug 616765

[patch] Correction of the fix.

0001-ifup-dhcp-fix-for-check-whether-ipv6-is-enabled.patch (text/plain), 1.04 KB, created by Marius Tomaschewski on 2010-11-11 13:32:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2010-11-11 13:32:05 UTC

Size: 1.04 KB

patch

obsolete

>From 8992f269e65472de130c38506d3566af8a21d18c Mon Sep 17 00:00:00 2001
>From: Marius Tomaschewski <mt@suse.de>
>Date: Thu, 11 Nov 2010 14:26:45 +0100
>Subject: [PATCH] ifup-dhcp: fix for check whether ipv6 is enabled
>
>Fixed check whether ipv6 is enabled or not in /sbin/ifup-dhcp
>(again). The last fix, disabled dhcpv6 completely (bnc#616765).
>
>Signed-off-by: Marius Tomaschewski <mt@suse.de>
>---
> scripts/ifup-dhcp |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp
>index 3c32517..604399f 100755
>--- a/scripts/ifup-dhcp
>+++ b/scripts/ifup-dhcp
>@@ -199,11 +199,13 @@ case "$ACTION" in
> 	;;
> 	*)
> 		HAVE_IPv6=yes
>-		test -d /proc/sys/net/ipv6 && {
>+		if test -d /proc/sys/net/ipv6 ; then
> 			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
>+		else
>+			HAVE_IPv6=no
>+		fi
> 
> 		clients=0
> 		bootprotos=(${BOOTPROTOS[@]})
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 616765: 375233 | 399687