blockd: restore device_move semantics

[project/fstools.git] / mount_root.c

diff --git a/mount_root.c b/mount_root.c
index 3c38a297b3e9b2d43f52eeaeb5763c284aae249a..d343909a9e0ccb6e898f57e1dd20500d7a400051 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -12,6 +12,9 @@
  */
 
 #include <sys/mount.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -29,8 +32,9 @@ start(int argc, char *argv[1])
 {
        struct volume *root;
        struct volume *data = volume_find("rootfs_data");
+       struct stat s;
 
-       if (!getenv("PREINIT"))
+       if (!getenv("PREINIT") && stat("/tmp/.preinit", &s))
                return -1;
 
        if (!data) {
@@ -40,28 +44,30 @@ 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");
+               return ramoverlay();
+
        case FS_DEADCODE:
                /*
                 * Filesystem isn't ready yet and we are in the preinit, so we
                 * can't afford waiting for it. Use tmpfs for now and handle it
                 * properly in the "done" call.
                 */
+               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);
@@ -99,6 +105,13 @@ done(int argc, char *argv[1])
        case FS_NONE:
        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);
+               break;
        }
 
        return 0;
@@ -108,6 +121,8 @@ int main(int argc, char **argv)
 {
        if (argc < 2)
                return start(argc, argv);
+       if (!strcmp(argv[1], "ram"))
+               return ramoverlay();
        if (!strcmp(argv[1], "stop"))
                return stop(argc, argv);
        if (!strcmp(argv[1], "done"))