[oe-commits] org.oe.dreambox netbase: fix wpa_supplicant handling

[tmbinc commit]

netbase: fix wpa_supplicant handling

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 9606f7d56b9a099573315b383b213caefd836da5
ViewMTN: http://monotone.openembedded.org/revision/info/9606f7d56b9a099573315b383b213caefd836da5
Files:
1
packages/netbase/netbase/init
packages/netbase/netbase_4.21.bb
Diffs:

#
# mt diff -r3bf15b642ccda5728a4a42fec49cefe5a7439ab4 -r9606f7d56b9a099573315b383b213caefd836da5
#
#
#
# patch "packages/netbase/netbase/init"
#  from [4fe982305438e61ae41cc3e2505aef5d614f483f]
#    to [29d45eb2ae42130b3bbc636aa043473e91b5ca3c]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [25e4ebe466ae88846afef7b552d41539ecc82bad]
#    to [bfced4c15460970e0e6266ebb86cc6476adaab71]
#
============================================================
--- packages/netbase/netbase/init	4fe982305438e61ae41cc3e2505aef5d614f483f
+++ packages/netbase/netbase/init	29d45eb2ae42130b3bbc636aa043473e91b5ca3c
@@ -48,11 +48,11 @@ wpa_supplicantcheck () {
 }
 
 wpa_supplicantcheck () {
-    if [ -e /var/run/wpa_supplicant/wlan0 ]; then
+    if [ -e /var/run/wpa_supplicant ]; then
         echo -n "disabling wpa_supplicant "
         start-stop-daemon -K -x /usr/sbin/wpa_supplicant
         # HACK: wpa_supplicant sometimes doesn't quit properly on SIGTERM.
-        if [ -e /var/run/wpa_supplicant/wlan0 ]; then
+        if [ -e /var/run/wpa_supplicant ]; then
         	echo -n "wpa_supplicant still running, force kill now.. "
         	killall -9 /usr/sbin/wpa_supplicant
         	rm -rf /var/run/wpa_supplicant
============================================================
--- packages/netbase/netbase_4.21.bb	25e4ebe466ae88846afef7b552d41539ecc82bad
+++ packages/netbase/netbase_4.21.bb	bfced4c15460970e0e6266ebb86cc6476adaab71
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r13"
+PR = "r14"
 
 inherit update-rc.d