summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Shapovalov <intelfx100@gmail.com>2012-10-02 19:50:56 +0200
committerJouke Witteveen <j.witteveen@gmail.com>2012-10-12 15:20:13 +0200
commit326cfb83b80103d90ad6ded579592ada22416f6d (patch)
tree8b66f19ed556b1dcc45b90b1978664a0ffede009
parentf60ec1546ca4ef3c4f615ee8184699847274733f (diff)
downloadnetctl-326cfb83b80103d90ad6ded579592ada22416f6d.tar.gz
netctl-326cfb83b80103d90ad6ded579592ada22416f6d.tar.xz
Include "-pf" when shutting down an ethernet connection with dhclient.
Executing "dhclient -x" also needs option "-pf" and a PID-file. Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
-rw-r--r--src/connections/ethernet8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/connections/ethernet b/src/connections/ethernet
index 94c04a1..33aae2f 100644
--- a/src/connections/ethernet
+++ b/src/connections/ethernet
@@ -229,8 +229,8 @@ ethernet_down() {
if [[ "$IP" == "dhcp" ]]; then
if checkyesno "${DHCLIENT:-no}"; then
if [[ -f "/run/dhclient-$INTERFACE.pid" ]]; then
- report_debug ethernet_down dhclient -q -x "$INTERFACE"
- dhclient -q -x "$INTERFACE" &>/dev/null
+ report_debug ethernet_down dhclient -q -x "$INTERFACE" -pf "/run/dhclient-$INTERFACE.pid"
+ dhclient -q -x "$INTERFACE" -pf "/run/dhclient-$INTERFACE.pid" &>/dev/null
#dhclient -q -r "$INTERFACE" &>/dev/null
fi
else
@@ -242,8 +242,8 @@ ethernet_down() {
fi
if [[ "$IP6" == dhcp* ]]; then
if [[ -f "/run/dhclient6-$INTERFACE.pid" ]]; then
- report_debug ethernet_down dhclient -6 -q -x "$INTERFACE"
- dhclient -6 -q -x "$INTERFACE" &>/dev/null
+ report_debug ethernet_down dhclient -6 -q -x "$INTERFACE" -pf "/run/dhclient6-$INTERFACE.pid"
+ dhclient -6 -q -x "$INTERFACE" -pf "/run/dhclient6-$INTERFACE.pid" &>/dev/null
report_debug ethernet_down /bin/kill $(< /run/dhclient6-$INTERFACE.pid)
/bin/kill $(< /run/dhclient6-$INTERFACE.pid) &>/dev/null
fi