diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-03-27 10:29:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-27 09:42:07 +0000 |
commit | 61b088abb8a1b09ccaf212ab30eddc93c39b55bf (patch) | |
tree | ab248fdb9698f71dff72209cb624cd975e722483 /meta | |
parent | b25e90f8f04407ccf44dfda1acd7c3d4aafb2bc8 (diff) | |
download | poky-61b088abb8a1b09ccaf212ab30eddc93c39b55bf.tar.gz |
image.bbclass: replace rootfs with /dev/root
Replace 'rootfs' with '/dev/root' in read_only_rootfs_hook function
to match the latest change in fstab file from the base-files recipe.
The related commit is as follows.
commit e8bc7a136a81a0d8df2d32dfba0920c1b2835141
base-files: use /dev/root in /etc/fstab for systemd support
(From OE-Core rev: 31b5aeb5a0b82842e1dd8545bf5d43778d8c218b)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index b0639ae33f..29309f55cb 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -175,7 +175,7 @@ do_rootfs[umask] = "022" | |||
175 | read_only_rootfs_hook () { | 175 | read_only_rootfs_hook () { |
176 | if ${@base_contains("DISTRO_FEATURES", "sysvinit", "true", "false", d)}; then | 176 | if ${@base_contains("DISTRO_FEATURES", "sysvinit", "true", "false", d)}; then |
177 | # Tweak the mount option and fs_passno for rootfs in fstab | 177 | # Tweak the mount option and fs_passno for rootfs in fstab |
178 | sed -i -e '/^[#[:space:]]*rootfs/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab | 178 | sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab |
179 | # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes | 179 | # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes |
180 | if [ -e ${IMAGE_ROOTFS}/etc/default/rcS ]; then | 180 | if [ -e ${IMAGE_ROOTFS}/etc/default/rcS ]; then |
181 | sed -i 's/ROOTFS_READ_ONLY=no/ROOTFS_READ_ONLY=yes/' ${IMAGE_ROOTFS}/etc/default/rcS | 181 | sed -i 's/ROOTFS_READ_ONLY=no/ROOTFS_READ_ONLY=yes/' ${IMAGE_ROOTFS}/etc/default/rcS |