fstools: remove SELinux restorecon hack

[project/fstools.git] / mount_root.c

diff --git a/mount_root.c b/mount_root.c
index 6e06b45806e5e05ae660f7692a6a1585bd220ef4..d343909a9e0ccb6e898f57e1dd20500d7a400051 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -44,18 +44,14 @@ start(int argc, char *argv[1])
                mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
        }
 
-       /*
-        * Before trying to mount and use "rootfs_data" let's check if there is
-        * extroot configured. Following call will handle reading config from
-        * the "rootfs_data" on its own.
-        */
-       extroot_prefix = "";
-       if (!mount_extroot()) {
+       /* Check for extroot config in rootfs before even trying rootfs_data */
+       if (!mount_extroot("")) {
                ULOG_NOTE("switched to extroot\n");
                return 0;
        }
 
        /* There isn't extroot, so just try to mount "rootfs_data" */
+       volume_init(data);
        switch (volume_identify(data)) {
        case FS_NONE:
                ULOG_WARN("no usable overlay filesystem found, using tmpfs overlay\n");
@@ -70,6 +66,8 @@ start(int argc, char *argv[1])
                ULOG_NOTE("jffs2 not ready yet, using temporary tmpfs overlay\n");
                return ramoverlay();
 
+       case FS_EXT4:
+       case FS_F2FS:
        case FS_JFFS2:
        case FS_UBIFS:
                mount_overlay(data);
@@ -108,6 +106,8 @@ done(int argc, char *argv[1])
        case FS_DEADCODE:
                return jffs2_switch(v);
 
+       case FS_EXT4:
+       case FS_F2FS:
        case FS_JFFS2:
        case FS_UBIFS:
                fs_state_set("/overlay", FS_STATE_READY);