diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh | 4 | ||||
-rw-r--r-- | 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 | |||
37 | mkdir -p /var/volatile/.lib-work | 37 | mkdir -p /var/volatile/.lib-work |
38 | # Try to mount using overlay, which is much faster than copying | 38 | # Try to mount using overlay, which is much faster than copying |
39 | # files. If that fails, fallback to the slower copy | 39 | # files. If that fails, fallback to the slower copy |
40 | if ! mount -t overlay overlay -olowerdir=/var/lib,upperdir=/var/volatile/lib,workdir=/var/volatile/.lib-work /var/lib > /dev/null 2>&1; then | 40 | 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 |
41 | cp -a /var/lib/* /var/volatile/lib | 41 | cp -a /var/lib/* /var/volatile/lib |
42 | mount --bind /var/volatile/lib /var/lib | 42 | mount SED_VARLIBMOUNTARGS --bind /var/volatile/lib /var/lib |
43 | fi | 43 | fi |
44 | fi | 44 | fi |
45 | fi | 45 | fi |
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 4b34c6a67f..e61ac554f3 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
@@ -58,10 +58,12 @@ FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" | |||
58 | FILES:${PN}-sushell = "${base_sbindir}/sushell" | 58 | FILES:${PN}-sushell = "${base_sbindir}/sushell" |
59 | 59 | ||
60 | HALTARGS ?= "-d -f" | 60 | HALTARGS ?= "-d -f" |
61 | VARLIBMOUNTARGS ?= "" | ||
61 | 62 | ||
62 | do_configure() { | 63 | do_configure() { |
63 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt | 64 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt |
64 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot | 65 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot |
66 | sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${WORKDIR}/read-only-rootfs-hook.sh | ||
65 | } | 67 | } |
66 | 68 | ||
67 | do_install () { | 69 | do_install () { |