initscripts: fix read-only-rootfs-hook.sh to start earlier

Mount /var/volatile ourselves so that we can set up the writable area
first. This fixes the urandom service not starting properly when
read-only-rootfs is enabled.

(From OE-Core rev: 44c7d8a27a84a04251408e9a7d9550629bc17704)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 2 insertions, 1 deletions

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh b/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
index 4f3e0d9645..9cf0921670 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
@@ -5,6 +5,7 @@
 [ "$ROOTFS_READ_ONLY" = "no" ] && exit 0
 
 if [ "$1" = "start" ] ; then
+        grep -q "tmpfs /var/volatile" /proc/mounts || mount /var/volatile
         mkdir -p /var/volatile/lib
         cp -a /var/lib/* /var/volatile/lib
         mount --bind /var/volatile/lib /var/lib
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 649e18269e..531b2b62df 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -118,7 +118,7 @@ do_install () {
         update-rc.d -r ${D} bootmisc.sh start 55 S .
         update-rc.d -r ${D} sysfs.sh start 02 S .
         update-rc.d -r ${D} populate-volatile.sh start 37 S .
-        update-rc.d -r ${D} read-only-rootfs-hook.sh start 41 S .
+        update-rc.d -r ${D} read-only-rootfs-hook.sh start 29 S .
         update-rc.d -r ${D} devpts.sh start 38 S .
         if [ "${TARGET_ARCH}" = "arm" ]; then
                 update-rc.d -r ${D} alignment.sh start 06 S .