aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-12-06 02:54:21 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-12-06 02:54:21 +0000
commitf8f03bdbbff14db0c79dfe1eb907e14a27ce0e73 (patch)
tree925c7c30b41de7302e33bee26cb5e4d0ead04524
parent80d5f7d27b5da8617d1058e2b5251a0a9076e507 (diff)
Bug #345281: If wpa_supplicant is built w/ USE=dbus, we need to start after DBus is up.
-rw-r--r--net/wpa_supplicant.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh
index f4ca7d62..379e6153 100644
--- a/net/wpa_supplicant.sh
+++ b/net/wpa_supplicant.sh
@@ -3,10 +3,14 @@
wpa_supplicant_depend()
{
- if [ -x /usr/sbin/wpa_supplicant ]; then
- program start /usr/sbin/wpa_supplicant
- else
- program start /sbin/wpa_supplicant
+ wpas=/usr/sbin/wpa_supplicant
+ [ -x ${wpas} ] || wpas=/sbin/wpa_supplicant
+ if [ -x ${wpas} ]; then
+ program start ${wpas}
+ # bug 345281: if wpa_supplicant is built w/ USE=dbus, we need to start
+ # dbus before we can start wpa_supplicant.
+ ${wpas} -h |grep DBus -sq
+ [ $? -eq 0 ] && need dbus
fi
after macnet plug
before interface