diff options
author | Jouke Witteveen <j.witteveen@gmail.com> | 2013-01-05 22:45:58 +0100 |
---|---|---|
committer | Jouke Witteveen <j.witteveen@gmail.com> | 2013-01-05 22:45:58 +0100 |
commit | 12f38d77c17df916eec0fb1440bf1941c2b55fcd (patch) | |
tree | a62ce0cd1bc022e062911f0973c09c01e94d4056 | |
parent | 6539dfe0df5c19e8acb8fe251b46098a25719cbc (diff) | |
download | netctl-12f38d77c17df916eec0fb1440bf1941c2b55fcd.tar.gz netctl-12f38d77c17df916eec0fb1440bf1941c2b55fcd.tar.xz |
Fix stopping wired connections
- Stop dhcpcd also when DHCPClient is not specified
- Exit successfully in ifplugd on going down
-rwxr-xr-x | src/ifplugd.action | 5 | ||||
-rw-r--r-- | src/lib/ip | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ifplugd.action b/src/ifplugd.action index 9716bce..617902f 100755 --- a/src/ifplugd.action +++ b/src/ifplugd.action @@ -44,7 +44,10 @@ case "$2" in ;; down) if [[ -e "$PROFILE_FILE" ]]; then - "$SUBR_DIR/network" stop "$(< "$PROFILE_FILE")" && rm -f "$PROFILE_FILE" + if ForceConnect=yes "$SUBR_DIR/network" stop "$(< "$PROFILE_FILE")"; then + rm -f "$PROFILE_FILE" + exit 0 + fi fi ;; *) @@ -188,7 +188,7 @@ ip_set() { # $IP6: type of IPv6 configuration ip_unset() { if [[ "$IP" == "dhcp" ]]; then - case $DHCPClient in + case ${DHCPClient:-dhcpcd} in dhcpcd) if [[ -f "/run/dhcpcd-$Interface.pid" ]]; then do_debug dhcpcd -qk "$Interface" >/dev/null |