always force to restore file contexts in initscripts

In policycoreutils-2.13+, restorecon changes its default behaviour,
and does not restore context if the file' type is correct, even its
mcs/mls level is incorrect.
We should force it always to restore file contexts in initscripts to
avoid issues.

Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>

3 files changed, 4 insertions, 4 deletions

diff --git a/recipes-core/initscripts/initscripts_1.0.bbappend b/recipes-core/initscripts/initscripts_1.0.bbappend
index 630b951..b8172c0 100644
--- a/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -1,8 +1,8 @@
-PR .= ".2"
+PR .= ".3"
 
 do_install_append () {
         cat <<-EOF >> ${D}${sysconfdir}/init.d/populate-volatile.sh
 touch /var/log/lastlog
-test ! -x /sbin/restorecon || /sbin/restorecon -R /var/volatile/
+test ! -x /sbin/restorecon || /sbin/restorecon -RF /var/volatile/ /run
 EOF
 }
diff --git a/recipes-core/udev/udev/init b/recipes-core/udev/udev/init
index 44a192a..5fd1011 100644
--- a/recipes-core/udev/udev/init
+++ b/recipes-core/udev/udev/init
@@ -81,6 +81,6 @@ else
         /sbin/udevadm settle
 fi
 
-test ! -x /sbin/restorecon || /sbin/restorecon /dev
+test ! -x /sbin/restorecon || /sbin/restorecon -F /dev
 
 exit 0
diff --git a/recipes-core/udev/udev_182.bbappend b/recipes-core/udev/udev_182.bbappend
index f42ad45..6f8f049 100644
--- a/recipes-core/udev/udev_182.bbappend
+++ b/recipes-core/udev/udev_182.bbappend
@@ -1,4 +1,4 @@
-PR .= ".3"
+PR .= ".4"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"