From 15acacb90ebbbaa629a07cfb5ebd0513b35c3f5d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 10 Aug 2009 17:17:32 -0400
Subject: Support dracut's location for dhclient leases as well. (#515771)

---
 sysconfig/network-scripts/ifup-eth | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 7c9e33b6..80bc7388 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -196,10 +196,12 @@ if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then
        DHCLIENTCONF='';
     fi;
     # copy any lease obtained by the initrd
-    if [ -f /dev/.dhclient-${DEVICE}.leases ] ; then
-    	mv -f /dev/.dhclient-${DEVICE}.leases /var/lib/dhclient/dhclient-${DEVICE}.leases
-	[ -x /sbin/restorecon ] && restorecon /var/lib/dhclient/dhclient-${DEVICE}.leases > /dev/null 2>&1
-    fi
+    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
+        fi
+    done
     DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid"
     echo
     echo -n $"Determining IP information for ${DEVICE}..."
-- 
cgit v1.2.1