summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-05-02 18:30:28 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-05-02 18:30:28 (GMT)
commit78abf88dcc5d39ef3a36477300ed00a730ce6daa (patch)
tree4ce52634cdbe4de16189c98c0a0dcb1840acc139
parent43afd75ea8de1c891c3c0a520cbb117e3f1ad49e (diff)
downloadbusybox-78abf88dcc5d39ef3a36477300ed00a730ce6daa.tar.gz
busybox-78abf88dcc5d39ef3a36477300ed00a730ce6daa.tar.bz2
ifdown: use /var/run/udhcpc.%iface%.pid only if it exists
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/ifupdown.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index bf88b1c..2f3dd1d 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -573,8 +573,10 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
{
int result;
- result = execute("kill "
- "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+ result = execute(
+ "test -f /var/run/udhcpc.%iface%.pid && "
+ "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
+ ifd, exec);
/* Also bring the hardware interface down since
killing the dhcp client alone doesn't do it.
This enables consecutive ifup->ifdown->ifup */