mount_root: code failed in failsafe

[project/fstools.git] / mount_root.c

diff --git a/mount_root.c b/mount_root.c
index 7b69c7f..77d683b 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -27,14 +27,16 @@
 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);
                ULOG_NOTE("mounting /dev/root\n");
                mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
@@ -68,6 +70,7 @@ start(int argc, char *argv[1])
 
        case FS_JFFS2:
        case FS_UBIFS:
+       case FS_EXT4FS:
                mount_overlay(data);
                break;
 
@@ -106,6 +109,7 @@ done(int argc, char *argv[1])
 
        case FS_JFFS2:
        case FS_UBIFS:
+       case FS_EXT4FS:
                fs_state_set("/overlay", FS_STATE_READY);
                break;
        }
@@ -117,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"))