summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Sueiro <diego.sueiro@arm.com>2020-12-03 11:18:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-06 23:16:50 +0000
commit39f16d7dc42dcfe4a3fcceb8e476ac3c1e0ba3a2 (patch)
treee5da6e4b192edf5d47ec338437629429db073136
parent572f3045faa0a937947fbd56bcfef7bad55e9da6 (diff)
downloadopenembedded-core-contrib-39f16d7dc42dcfe4a3fcceb8e476ac3c1e0ba3a2.tar.gz
initscripts: Change execution order between checkroot and modutils
When '/' is first mounted as read-only, we want to have the checkroot.sh initscript (which then remounts '/' as rw if allowed) running before the modutils.sh. This is because modutils.sh initscript might need to run depmod depending on the status of the modules.dep file to update it and the '/' needs to be writable. Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
-rw-r--r--meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 32c527799e..5e994f2b7f 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -136,7 +136,7 @@ do_install () {
update-rc.d -r ${D} halt start 90 0 .
update-rc.d -r ${D} save-rtc.sh start 25 0 6 .
update-rc.d -r ${D} banner.sh start 02 S .
- update-rc.d -r ${D} checkroot.sh start 06 S .
+ update-rc.d -r ${D} checkroot.sh start 05 S .
update-rc.d -r ${D} mountall.sh start 03 S .
update-rc.d -r ${D} hostname.sh start 39 S .
update-rc.d -r ${D} mountnfs.sh start 15 2 3 4 5 .
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
index 881b7db92e..97b4ddb88b 100644
--- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
@@ -10,7 +10,7 @@ PR = "r7"
S = "${WORKDIR}"
INITSCRIPT_NAME = "modutils.sh"
-INITSCRIPT_PARAMS = "start 05 S ."
+INITSCRIPT_PARAMS = "start 06 S ."
inherit update-rc.d