block: rework config loading

[project/fstools.git] / mount_root.c

diff --git a/mount_root.c b/mount_root.c
index 1df4723..cc39b44 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -18,40 +18,55 @@
 #include "libfstools/libfstools.h"
 #include "libfstools/volume.h"
 
+/*
+ * Called in the early (PREINIT) stage, when we immediately need some writable
+ * filesystem.
+ */
 static int
 start(int argc, char *argv[1])
 {
-       struct volume *v = volume_find("rootfs_data");
+       struct volume *root;
+       struct volume *data = volume_find("rootfs_data");
 
        if (!getenv("PREINIT"))
                return -1;
 
-       if (!v) {
-               v = volume_find("rootfs");
-               volume_init(v);
+       if (!data) {
+               root = volume_find("rootfs");
+               volume_init(root);
                fprintf(stderr, "mounting /dev/root\n");
                mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
-               return 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()) {
                fprintf(stderr, "fs-state: switched to extroot\n");
                return 0;
        }
 
-       switch (volume_identify(v)) {
+       /* There isn't extroot, so just try to mount "rootfs_data" */
+       switch (volume_identify(data)) {
        case FS_NONE:
        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.
+                */
                return ramoverlay();
 
        case FS_JFFS2:
        case FS_UBIFS:
-               mount_overlay();
+               mount_overlay(data);
                break;
 
        case FS_SNAPSHOT:
-               mount_snapshot();
+               mount_snapshot(data);
                break;
        }
 
@@ -67,6 +82,9 @@ stop(int argc, char *argv[1])
        return 0;
 }
 
+/*
+ * Called at the end of init, it can wait for filesystem if needed.
+ */
 static int
 done(int argc, char *argv[1])
 {
@@ -78,7 +96,7 @@ done(int argc, char *argv[1])
        switch (volume_identify(v)) {
        case FS_NONE:
        case FS_DEADCODE:
-               return jffs2_switch(argc, argv);
+               return jffs2_switch(v);
        }
 
        return 0;