[oe-commits] Chen Qi : image.bbclass: replace rootfs with /dev/root

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 31b5aeb5a0b82842e1dd8545bf5d43778d8c218b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=31b5aeb5a0b82842e1dd8545bf5d43778d8c218b

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Thu Mar 27 10:29:07 2014 +0800

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

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index b0639ae..29309f5 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -175,7 +175,7 @@ do_rootfs[umask] = "022"
 read_only_rootfs_hook () {
 	if ${@base_contains("DISTRO_FEATURES", "sysvinit", "true", "false", d)}; then
 	        # Tweak the mount option and fs_passno for rootfs in fstab
-		sed -i -e '/^[#[:space:]]*rootfs/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab
+		sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab
 	        # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes
 		if [ -e ${IMAGE_ROOTFS}/etc/default/rcS ]; then
 			sed -i 's/ROOTFS_READ_ONLY=no/ROOTFS_READ_ONLY=yes/' ${IMAGE_ROOTFS}/etc/default/rcS