aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-08-09 05:52:52 +0000
committerBill Nottingham <notting@redhat.com>2001-08-09 05:52:52 +0000
commitc2fe554422ea22180384b5751a427f5c60ba9d34 (patch)
tree8a0a254c9ce1a404cbbc8544c8081140186b9f20 /sysconfig
parent077ed6c84743d77fb39659bbaae3a68d16f67b2e (diff)
downloadinitscripts-c2fe554422ea22180384b5751a427f5c60ba9d34.tar
initscripts-c2fe554422ea22180384b5751a427f5c60ba9d34.tar.gz
initscripts-c2fe554422ea22180384b5751a427f5c60ba9d34.tar.bz2
initscripts-c2fe554422ea22180384b5751a427f5c60ba9d34.tar.xz
initscripts-c2fe554422ea22180384b5751a427f5c60ba9d34.zip
just kill dhcpcd, don't use dhcpcd -k. also, allow setting of additional pump & dhcpcd arguments (#46942)
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifdown2
-rwxr-xr-xsysconfig/network-scripts/ifup4
2 files changed, 3 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 9ff1cfde..69ea3670 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -73,7 +73,7 @@ fi
retcode=0
if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
[ -n "`pidof -x dhcpcd`" ] && {
- dhcpcd -k ${DEVICE}
+ killall dhcpcd
retcode=$?
}
[ -n "`pidof -x pump`" ] && {
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index db3c6205..ec320fd6 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -149,8 +149,8 @@ if [ -f /etc/sysconfig/ipchains -a \
fi
if [ -n "${DYNCONFIG}" ]; then
- PUMPARGS=
- DHCPCDARGS=
+ PUMPARGS=$PUMPARGS
+ DHCPCDARGS=$DHCPCDARGS
if [ -n "${DHCP_HOSTNAME}" ]; then
PUMPARGS="-h ${DHCP_HOSTNAME}"
DHCPCDARGS="-h ${DHCP_HOSTNAME}"