Attachment 608007 Details for Bug 607921 – ifX-eth changes to share lease file

[patch] ifX-eth changes to share lease file

ifx-eth.diff (text/plain), 2.41 KB, created by Paul Smith on 2012-08-29 22:28:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Smith

Created: 2012-08-29 22:28:30 UTC

Size: 2.41 KB

patch

obsolete

>--- ifup-eth.orig	2012-04-27 05:48:34.000000000 -0400
>+++ ifup-eth	2012-08-29 17:36:45.195690532 -0400
>@@ -188,11 +188,11 @@
>     # copy any lease obtained by the initrd
>     for file in /dev/.dhclient-${DEVICE}.leases /dev/.initramfs/net.${DEVICE}.lease ; do
>         if [ -f "${file}" ]; then
>-            mv -f $file /var/lib/dhclient/dhclient-${DEVICE}.leases
>-            [ -x /sbin/restorecon ] && restorecon /var/lib/dhclient/dhclient-${DEVICE}.leases > /dev/null 2>&1
>+            mv -f $file /var/lib/dhclient/dhclient-${UUID:+$UUID-}${DEVICE}.lease
>+            [ -x /sbin/restorecon ] && restorecon /var/lib/dhclient/dhclient-${UUID:+$UUID-}${DEVICE}.lease > /dev/null 2>&1
>         fi
>     done
>-    DHCLIENTARGS="${DHCLIENTARGS} ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid"
>+    DHCLIENTARGS="${DHCLIENTARGS} ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${UUID:+$UUID-}${DEVICE}.lease -pf /var/run/dhclient-${DEVICE}.pid"
>     echo
>     echo -n $"Determining IP information for ${DEVICE}..."
>     if [[ "${PERSISTENT_DHCLIENT}" !=  [yY1]* ]] && check_link_down ${DEVICE}; then
>@@ -299,7 +299,7 @@
> # IPv6 initialisation?
> /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
> if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
>-    /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE}
>+    /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} -lf /var/lib/dhclient/dhclient6-${UUID:+$UUID-}${DEVICE}.lease -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE}
> fi
> 
> exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}
>--- ifdown-eth.orig	2012-04-27 05:48:34.000000000 -0400
>+++ ifdown-eth	2012-08-29 17:37:18.562615480 -0400
>@@ -87,7 +87,7 @@
> 	if [ -f "/var/run/dhclient$VER-${DEVICE}.pid" ]; then
> 		dhcpid=$(cat /var/run/dhclient$VER-${DEVICE}.pid)
> 		if [[ "$DHCPRELEASE" = [yY1]* ]];  then
>-			/sbin/dhclient -r -lf /var/lib/dhclient/dhclient$VER-${DEVICE}.leases -pf /var/run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1
>+			/sbin/dhclient -r -lf /var/lib/dhclient/dhclient$VER-${UUID:+$UUID-}${DEVICE}.lease -pf /var/run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1
> 			retcode=$?
> 		else
> 			kill $dhcpid >/dev/null 2>&1

Actions: View | Diff

Attachments on bug 607921: 428309 | 428313 | 457511 | 608007