diff options
| author | Trond Eivind Glomsrod <teg@redhat.com> | 2001-07-02 00:07:34 +0000 |
|---|---|---|
| committer | Trond Eivind Glomsrod <teg@redhat.com> | 2001-07-02 00:07:34 +0000 |
| commit | 3d293aa2f3252963514212ba25baf2dc139d997d (patch) | |
| tree | 9d857a1e4ace19f52fd2d8f8e4cbd514078179eb /sysconfig | |
| parent | f1a7234440ef762a3f659fe3c6dc4f5bfe8234f1 (diff) | |
| download | initscripts-3d293aa2f3252963514212ba25baf2dc139d997d.tar initscripts-3d293aa2f3252963514212ba25baf2dc139d997d.tar.gz initscripts-3d293aa2f3252963514212ba25baf2dc139d997d.tar.bz2 initscripts-3d293aa2f3252963514212ba25baf2dc139d997d.tar.xz initscripts-3d293aa2f3252963514212ba25baf2dc139d997d.zip | |
Reenable pump, but make dhcpcd is the default. This makes updates of systemsr5-97
without dhcpcd installed easier.
Diffstat (limited to 'sysconfig')
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 6 |
1 files changed, 6 insertions, 0 deletions
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 |