aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Vas Dias <jvdias@redhat.com>2004-08-11 15:05:17 +0000
committerJason Vas Dias <jvdias@redhat.com>2004-08-11 15:05:17 +0000
commite0529f059d8218ae7458e36f5cd2335bec30356d (patch)
treea23077c940a8acc0511ebcc8808bc3d2062c1339
parent44d54fb05e96d3b76a81e1abc41c1f5691795d64 (diff)
downloadinitscripts-e0529f059d8218ae7458e36f5cd2335bec30356d.tar
initscripts-e0529f059d8218ae7458e36f5cd2335bec30356d.tar.gz
initscripts-e0529f059d8218ae7458e36f5cd2335bec30356d.tar.bz2
initscripts-e0529f059d8218ae7458e36f5cd2335bec30356d.tar.xz
initscripts-e0529f059d8218ae7458e36f5cd2335bec30356d.zip
fixed bug #120093: added PERSISTANT_DHCLIENT option to ifcfg files
-rw-r--r--initscripts.spec8
-rwxr-xr-xsysconfig/network-scripts/ifup7
2 files changed, 13 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 897dc756..dd8f0a03 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 7.60
+Version: 7.61
License: GPL
Group: System Environment/Base
Release: 1
@@ -250,9 +250,15 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Tue Aug 11 2004 Jason Vas Dias <jvdias@redhat.com> 7.61-1
+- fix for bug 120093: add PERSISTANT_DHCLIENT option to ifcfg files
+
* Tue Aug 03 2004 Karsten Hopp <karsten@redhat.de> 7.60-1
- write peerid into sysfs for IUCV devices (mainframe)
+* Fri Jul 30 2004 Jason Vas Dias <jvdias@redhat.com> 7.60-1
+- fix for bug 125712: add 'change_resolv.conf' function
+
* Fri Jul 2 2004 Bill Nottingham <notting@redhat.com> 7.59-1
- set context on ICE directory after making it (#127099, <concert@europe.com>)
- don't mount GFS filesystems in rc.sysinit
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 41d8821a..53a6ebbf 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -252,7 +252,12 @@ fi
if [ -n "${DYNCONFIG}" ]; then
PUMPARGS=$PUMPARGS
DHCPCDARGS="$DHCPCDARGS -n"
- DHCLIENTARGS="${DHCLIENTARGS} -1 -q -lf /var/lib/dhcp/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid -cf /etc/dhclient-${DEVICE}.conf"
+ if [[ "${PERSISTANT_DHCLIENT}" = [yY1]* ]]; then
+ ONESHOT="";
+ else
+ ONESHOT="-1";
+ fi;
+ DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q -lf /var/lib/dhcp/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid -cf /etc/dhclient-${DEVICE}.conf"
if [ -n "${DHCP_HOSTNAME}" ]; then
# Send a host-name to the DHCP server (requ. by some dhcp servers).
PUMPARGS="${PUMPARGS} -h ${DHCP_HOSTNAME}"