base-files: update fstab

The "tizen_fstab" was the same as the original OE fstab; installing
it instead of the original file is pointless.

But we *do* need to modify the original fstab to solve one issue:
systemd-fsck-root.service looks at the file system entry and runs
"fsck.auto" if we keep OE's "auto" entry.

This does not prevent booting, only the file system checking part
of it.

To replace the original file, we use the same name because then
the modified file will be used even when we revert the do_install
override.

diff --git a/meta-tizen-adaptation/meta/recipes-core/base-files/base-files/tizen_fstab b/meta-tizen-adaptation/meta/recipes-core/base-files/base-files/fstab
similarity index 70%
rename from meta-tizen-adaptation/meta/recipes-core/base-files/base-files/tizen_fstab
rename to meta-tizen-adaptation/meta/recipes-core/base-files/base-files/fstab
index 638bb1b..2e2725d 100644 (file)
--- a/meta-tizen-adaptation/meta/recipes-core/base-files/base-files/tizen_fstab
+++ b/meta-tizen-adaptation/meta/recipes-core/base-files/base-files/fstab
@@ -1,6 +1,9 @@
-# stock fstab - you probably want to override this with a machine specific one
+# Tizen fstab
+
+# We have to use "ext4" instead of "auto" because otherwise systemd tries
+# to invoke fsck.auto, which does not exist.
+/dev/root            /                    ext4       defaults              1  1
 
-/dev/root            /                    auto       defaults              1  1
 proc                 /proc                proc       defaults              0  0
 devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
 tmpfs                /dev/shm             tmpfs      defaults              0  0

diff --git a/meta-tizen-adaptation/meta/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-tizen-adaptation/meta/recipes-core/base-files/base-files_3.0.14.bbappend
index 56b082d..1d916c6 100644 (file)
--- a/meta-tizen-adaptation/meta/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-tizen-adaptation/meta/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,8 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:"
 
-SRC_URI += " file://tizen_fstab \
-           "
-
 volatiles = "tmp"
 dirs1777 = "/tmp"
 
@@ -39,7 +36,7 @@ do_install () {
                install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation
        fi
 
-       install -m 0644 ${WORKDIR}/tizen_fstab ${D}${sysconfdir}/fstab
+       install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
        install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
        install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
        install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile