Adds bitbake variable to set additional mount flags for the /var/lib overlayfs or bind mount when using a read-only root filesystem. This can be used to set additional options like "-o nodev".
(From OE-Core rev: c3109e40e2c2c881996dd3fcc95fca74f098646d) Signed-off-by: Colin McAllister <[email protected]> Signed-off-by: Richard Purdie <[email protected]> --- .../initscripts/initscripts-1.0/read-only-rootfs-hook.sh | 4 ++-- meta/recipes-core/initscripts/initscripts_1.0.bb | 2 ++ 2 files changed, 4 insertions(+), 2 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 6706a117f7..a29773647f 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 @@ -37,9 +37,9 @@ if [ "$1" = "start" ] ; then mkdir -p /var/volatile/.lib-work # Try to mount using overlay, which is much faster than copying # files. If that fails, fallback to the slower copy - if ! mount -t overlay overlay -olowerdir=/var/lib,upperdir=/var/volatile/lib,workdir=/var/volatile/.lib-work /var/lib > /dev/null 2>&1; then + if ! mount -t overlay overlay SED_VARLIBMOUNTARGS -olowerdir=/var/lib,upperdir=/var/volatile/lib,workdir=/var/volatile/.lib-work /var/lib > /dev/null 2>&1; then cp -a /var/lib/* /var/volatile/lib - mount --bind /var/volatile/lib /var/lib + mount SED_VARLIBMOUNTARGS --bind /var/volatile/lib /var/lib fi fi fi diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 7c9d9ca4f1..e28d8c6b72 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -59,10 +59,12 @@ FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" FILES:${PN}-sushell = "${base_sbindir}/sushell" HALTARGS ?= "-d -f" +VARLIBMOUNTARGS ?= "" do_configure() { sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot + sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${WORKDIR}/read-only-rootfs-hook.sh } do_install () { -- 2.45.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199598): https://lists.openembedded.org/g/openembedded-core/message/199598 Mute This Topic: https://lists.openembedded.org/mt/106206913/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
