diff options
| -rw-r--r-- | initscripts.spec | 7 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec index be01e255..30cd55ca 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 5.96 +Version: 5.97 License: GPL Group: System Environment/Base Release: 1 @@ -222,6 +222,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Sat Jul 01 2001 Trond Eivind Glomsrød <teg@redhat.com> +- reenable pump, but make sure dhcpcd is the default. This + way, upgrades of systems without dhcpcd has a better chance at + working. + * Thu Jun 28 2001 Trond Eivind Glomsrød <teg@redhat.com> - Disable pump completely diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 670db6ef..6a418d40 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -137,14 +137,18 @@ if [ -f /etc/sysconfig/ipchains -a \ fi if [ -n "${DYNCONFIG}" ]; then + PUMPARGS= DHCPCDARGS= if [ -n "${DHCP_HOSTNAME}" ]; then + PUMPARGS="-h ${DHCP_HOSTNAME}" DHCPCDARGS="-h ${DHCP_HOSTNAME}" fi if [ -n "${NEEDHOSTNAME}" ]; then + PUMPARGS="${PUMPARGS} --lookup-hostname" DHCPCDARGS="${DHCPCDARGS} -H" fi if [ "${PEERDNS}" = "no" ]; then + PUMPARGS="${PUMPARGS} -d" DHCPCDARGS="${DHCPCDARGS} -R" fi echo -n $"Determining IP information for ${DEVICE}..." @@ -163,6 +167,8 @@ if [ -n "${DYNCONFIG}" ]; then if [ -x /sbin/dhcpcd ] && /sbin/dhcpcd ${DHCPCDARGS} ${DEVICE} ; then echo $" done." + elif [ -x /sbin/pump ] && /sbin/pump ${PUMPARGS} -i ${DEVICE} ; then + echo $" done." else echo $" failed." [ -n "$FWHACK" ] && ipchains -D input -s 0/0 53 -p udp -j ACCEPT |