Attachment 717689 Details for Bug 846618 – potential patch

[patch] potential patch

ifup-eth.patch (text/plain), 1.49 KB, created by Lukáš Nykrýn on 2013-03-28 15:06:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukáš Nykrýn

Created: 2013-03-28 15:06:50 UTC

Size: 1.49 KB

patch

obsolete

>diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
>index 56169ec..b9e7721 100755
>--- a/sysconfig/network-scripts/ifup-eth
>+++ b/sysconfig/network-scripts/ifup-eth
>@@ -174,9 +174,16 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
> 
>     if /sbin/dhclient ${DHCLIENTARGS} ${DEVICE} ; then
> 	echo $" done."
>+	dhcpipv4="good"
>     else
> 	echo $" failed."
>-	exit 1
>+	if [[ "${IPV4_FAILURE_FATAL}"  = [Yy1]* ]] ; then
>+	    exit 1
>+	fi
>+	if [[ "$IPV6INIT" != [yY1]* && "$DHCPV6C" != [yY1]* ]] ; then
>+	    exit 1
>+	fi
>+	net_log "Unable to obtain IPv4 DHCP address ${DEVICE}." warning
>     fi
> # end dynamic device configuration
> else 
>@@ -276,7 +283,18 @@ fi
> if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
>     generate_config_file_name 6
>     generate_lease_file_name 6
>-    /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE}
>+    echo
>+    echo -n $"Determining IPv6 information for ${DEVICE}..."
>+    if /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE} ; then
>+        echo $" done."
>+    else
>+        echo $" failed."
>+        if [ "${dhcpipv4}" = "good" -o -n "${IPADDR}" ]; then
>+            net_log "Unable to obtain IPv6 DHCP address ${DEVICE}." warning
>+        else
>+            exit 1
>+        fi
>+    fi
> fi
> 
> if [ "${IPX}" = yes ]; then

Actions: View | Diff

Attachments on bug 846618: 717689