wpa_supplicant: Use volatiles for managing /var/run/wpa_supplicant

3 files changed, 9 insertions, 4 deletions

diff --git a/meta/packages/wpa-supplicant/files/99_wpa_supplicant b/meta/packages/wpa-supplicant/files/99_wpa_supplicant
new file mode 100644
index 0000000000..6ff4dd8826
--- /dev/null
+++ b/meta/packages/wpa-supplicant/files/99_wpa_supplicant
@@ -0,0 +1 @@
+d root root 0700 /var/run/wpa_supplicant none
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
index c8578e7c25..667b168ee6 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
+++ b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
@@ -11,7 +11,8 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
         file://defaults-sane \
         file://wpa-supplicant.sh \
         file://wpa_supplicant.conf \
-        file://wpa_supplicant.conf-sane"
+        file://wpa_supplicant.conf-sane \
+        file://99_wpa_supplicant"
 
 S = "${WORKDIR}/wpa_supplicant-${PV}"
 
@@ -35,8 +36,6 @@ do_install () {
         install -m 755 wpa_passphrase ${D}${sbindir}
         install -m 755 wpa_cli        ${D}${sbindir}
 
-        install -d ${D}${localstatedir}/run/wpa_supplicant
-
         install -d ${D}${docdir}/wpa_supplicant
         install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
 
@@ -54,9 +53,14 @@ do_install () {
 
         install -d ${D}/${sysconfdir}/dbus-1/system.d
         install -m 644 ${S}/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
+
+        install -d ${D}/etc/default/volatiles
+        install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }
 
 pkg_postinst_wpa-supplicant () {
+        /etc/init.d/populate-volatile.sh update
+
         # can't do this offline
         if [ "x$D" != "x" ]; then
                 exit 1
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
index e4babb2b6d..440cdebfd8 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
@@ -1,3 +1,3 @@
 require wpa-supplicant-0.5.inc
 
-PR = "r4"
+PR = "r5"