From e2d4fb9de77b0e2f2dab503b58491ffb2fd04c36 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 3 Mar 2005 21:08:09 +0000
Subject: ipv6 cleanups (<pb@bieringer.de>)

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

(limited to 'sysconfig/network-scripts/ifup-eth')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index b488d272..393a966e 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -22,15 +22,6 @@ need_config ${CONFIG}
 
 source_config
 
-# Old BOOTP variable
-if [ "${BOOTP}" = "yes" ]; then
-    BOOTPROTO=bootp
-fi
-
-if [ "${BOOTPROTO}" = "bootp" -o "${BOOTPROTO}" = "dhcp" ]; then
-    DYNCONFIG=true
-fi
-
 # load the module associated with that device
 # /sbin/modprobe ${REALDEVICE}
 is_available ${REALDEVICE}
@@ -143,7 +134,7 @@ if [ -w /etc/dhclient-${DEVICE}.conf ] && [ -x /sbin/dhclient ] ; then
    rm -f /etc/dhclient-${DEVICE}.conf.ifupnew
 fi
 		     
-if [ -n "${DYNCONFIG}" ]; then
+if [ "${BOOTPROTO}" = "bootp" -o "${BOOTPROTO}" = "dhcp" ]; then
     PUMPARGS=$PUMPARGS
     DHCPCDARGS="$DHCPCDARGS -n"
     if [[ "${PERSISTENT_DHCLIENT}" =  [yY1]* ]]; then
@@ -203,6 +194,8 @@ if [ -n "${DYNCONFIG}" ]; then
 	FWHACK=1
     fi
     
+    release_dhcp_lease
+    
     if [ -x /sbin/dhclient ] && /sbin/dhclient ${DHCLIENTARGS} ${DEVICE} ; then
 	echo $" done."
     else
-- 
cgit