Revert "fstools: support for ext4fs overlay"

[project/fstools.git] / mount_root.c

diff --git a/mount_root.c b/mount_root.c
index cc39b44c3fc2a4a796a86960a54966a61ce2a5a6..d1b69814fcf0c9e569b4a1ea7fbdfe530f68bd2e 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -15,6 +15,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <libubox/ulog.h>
+
 #include "libfstools/libfstools.h"
 #include "libfstools/volume.h"
 
@@ -25,16 +27,18 @@
 static int
 start(int argc, char *argv[1])
 {
-       struct volume *root;
+       struct volume *root = volume_find("rootfs");
        struct volume *data = volume_find("rootfs_data");
 
-       if (!getenv("PREINIT"))
+       if (data && find_mount_point(data->blk, 0))
+               return -1;
+
+       if (root && find_mount_point(root->blk, 0))
                return -1;
 
        if (!data) {
-               root = volume_find("rootfs");
                volume_init(root);
-               fprintf(stderr, "mounting /dev/root\n");
+               ULOG_NOTE("mounting /dev/root\n");
                mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
        }
 
@@ -45,19 +49,23 @@ start(int argc, char *argv[1])
         */
        extroot_prefix = "";
        if (!mount_extroot()) {
-               fprintf(stderr, "fs-state: switched to extroot\n");
+               ULOG_NOTE("switched to extroot\n");
                return 0;
        }
 
        /* There isn't extroot, so just try to mount "rootfs_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_JFFS2:
@@ -97,6 +105,11 @@ done(int argc, char *argv[1])
        case FS_NONE:
        case FS_DEADCODE:
                return jffs2_switch(v);
+
+       case FS_JFFS2:
+       case FS_UBIFS:
+               fs_state_set("/overlay", FS_STATE_READY);
+               break;
        }
 
        return 0;
@@ -106,6 +119,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"))