diff options
| author | Bill Nottingham <notting@redhat.com> | 2005-03-03 21:08:09 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2005-03-03 21:08:09 +0000 |
| commit | e2d4fb9de77b0e2f2dab503b58491ffb2fd04c36 (patch) | |
| tree | 45e3b19ebf61cf8291383466f5f5c158e0154437 /sysconfig/network-scripts/ifup-eth | |
| parent | a9e02bb3e63fa5d94ef063aec402617c454f7e5c (diff) | |
| download | initscripts-e2d4fb9de77b0e2f2dab503b58491ffb2fd04c36.tar initscripts-e2d4fb9de77b0e2f2dab503b58491ffb2fd04c36.tar.gz initscripts-e2d4fb9de77b0e2f2dab503b58491ffb2fd04c36.tar.bz2 initscripts-e2d4fb9de77b0e2f2dab503b58491ffb2fd04c36.tar.xz initscripts-e2d4fb9de77b0e2f2dab503b58491ffb2fd04c36.zip | |
ipv6 cleanups (<pb@bieringer.de>)
Diffstat (limited to 'sysconfig/network-scripts/ifup-eth')
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 13 |
1 files changed, 3 insertions, 10 deletions
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 |