aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-08-09 06:00:22 +0000
committerBill Nottingham <notting@redhat.com>2001-08-09 06:00:22 +0000
commitb7801a7e92dc7fce2d4b4a2b502b3e9ac40e3ed3 (patch)
tree37481214eb3b1cc987ae1858198f61e8b744a52d /sysconfig/network-scripts
parentc2fe554422ea22180384b5751a427f5c60ba9d34 (diff)
downloadinitscripts-b7801a7e92dc7fce2d4b4a2b502b3e9ac40e3ed3.tar
initscripts-b7801a7e92dc7fce2d4b4a2b502b3e9ac40e3ed3.tar.gz
initscripts-b7801a7e92dc7fce2d4b4a2b502b3e9ac40e3ed3.tar.bz2
initscripts-b7801a7e92dc7fce2d4b4a2b502b3e9ac40e3ed3.tar.xz
initscripts-b7801a7e92dc7fce2d4b4a2b502b3e9ac40e3ed3.zip
behave sanely if ifup is called with dhcpcd already running (#49392, #51038)
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-xsysconfig/network-scripts/ifup4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index ec320fd6..0ea87418 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -150,7 +150,7 @@ fi
if [ -n "${DYNCONFIG}" ]; then
PUMPARGS=$PUMPARGS
- DHCPCDARGS=$DHCPCDARGS
+ DHCPCDARGS="$DHCPCDARGS -n"
if [ -n "${DHCP_HOSTNAME}" ]; then
PUMPARGS="-h ${DHCP_HOSTNAME}"
DHCPCDARGS="-h ${DHCP_HOSTNAME}"
@@ -175,7 +175,7 @@ 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
+ elif [ -z "`pidof -x dhcpcd`" ] && [ -x /sbin/pump ] && /sbin/pump ${PUMPARGS} -i ${DEVICE}; then
echo $" done."
else
echo $" failed."