summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2010-09-02 09:42:11 -0500
committerWilliam Hubbs <williamh@gentoo.org>2010-09-02 09:42:11 -0500
commitf700243016dd789616acb681a05d90fe033c6061 (patch)
treee6e2692b85e6d452059bfec2595af33d882bf1f7
parentb232e529f191369207ddf03570a4267950cc1ce7 (diff)
downloadopenrc-f700243016dd789616acb681a05d90fe033c6061.tar.gz
openrc-f700243016dd789616acb681a05d90fe033c6061.tar.bz2
openrc-f700243016dd789616acb681a05d90fe033c6061.tar.xz
Revert "fix bug 266395"
This reverts commit 1a188f8f725186b2c2d6d7c67e79c2ff5ea9d05e. This revert fixes bug #334663.
-rw-r--r--net/wpa_supplicant.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh
index 24ecdb1..f4ca7d6 100644
--- a/net/wpa_supplicant.sh
+++ b/net/wpa_supplicant.sh
@@ -183,11 +183,9 @@ wpa_supplicant_post_stop()
fi
if yesno "${IN_BACKGROUND}"; then
- # Don't stop wpa_supplicant & wpa_cli if in background
- return 0
+ # Only stop wpa_supplicant if it's not the controlling daemon
+ ! service_started_daemon "${RC_SVCNAME}" "${wpas}" 1
fi
- # Only stop wpa_supplicant if it's not the controlling daemon
- ! service_started_daemon "${RC_SVCNAME}" "${wpas}" 1
[ $? != 0 ] && return 0
local pidfile="/var/run/wpa_cli-${IFACE}.pid"