[oe-commits] org.oe.dreambox netbase: shut down wpa_supplicant after deconfiguring network interfaces

[tmbinc commit]

netbase: shut down wpa_supplicant after deconfiguring network interfaces

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

#
# mt diff -r4cde9535e8aed1d1a60c98813fb8c299d704b94d -r77f8deb1a04d6ccb1cae4c935e362d2337cbaa55
#
#
#
# patch "packages/netbase/netbase/init"
#  from [4fe17ee3c9de294b2a78d5429557c31b02feed68]
#    to [4fe982305438e61ae41cc3e2505aef5d614f483f]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [87f094dca462079cf8ea9a449b891476abe99418]
#    to [25e4ebe466ae88846afef7b552d41539ecc82bad]
#
============================================================
--- packages/netbase/netbase/init	4fe17ee3c9de294b2a78d5429557c31b02feed68
+++ packages/netbase/netbase/init	4fe982305438e61ae41cc3e2505aef5d614f483f
@@ -47,6 +47,21 @@ syncookies () {
     fi
 }
 
+wpa_supplicantcheck () {
+    if [ -e /var/run/wpa_supplicant/wlan0 ]; 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
+        	echo -n "wpa_supplicant still running, force kill now.. "
+        	killall -9 /usr/sbin/wpa_supplicant
+        	rm -rf /var/run/wpa_supplicant
+        	echo "done."
+    		fi
+        echo "done."
+    fi
+}
+
 doopt () {
     optname=$1
     default=$2
@@ -67,6 +82,7 @@ case "$1" in
         doopt ip_forward no
 
         echo -n "Configuring network interfaces... "
+				wpa_supplicantcheck
         ifup -a
 	echo "done."
 	;;
@@ -83,12 +99,14 @@ case "$1" in
         else
             echo -n "Deconfiguring network interfaces... "
             ifdown -a
+            wpa_supplicantcheck
 	    echo "done."
         fi
 	;;
     force-reload|restart)
         echo -n "Reconfiguring network interfaces... "
         ifdown -a
+        wpa_supplicantcheck
         ifup -a
 	echo "done."
 	;;
============================================================
--- packages/netbase/netbase_4.21.bb	87f094dca462079cf8ea9a449b891476abe99418
+++ packages/netbase/netbase_4.21.bb	25e4ebe466ae88846afef7b552d41539ecc82bad
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
 
 inherit update-rc.d