mount_root: permit to pass mount options for rootfs mount

[project/fstools.git] / mount_root.c

diff --git a/mount_root.c b/mount_root.c
index bf70265d45cc49568562e58ecfe6bd6cf41929be..e7c398f3d27961c423b91deed4f0b4f2f3278799 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>
 
@@ -25,33 +28,39 @@
  * filesystem.
  */
 static int
-start(int argc, char *argv[1])
+start(int argc, char *argv[3])
 {
        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) {
                root = volume_find("rootfs");
                volume_init(root);
-               ULOG_NOTE("mounting /dev/root\n");
-               mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
+               if (argc < 3)
+                       ULOG_NOTE("mounting /dev/root\n");
+               else
+                       ULOG_NOTE("mounting /dev/root with options %s\n", argv[2]);
+
+               /*
+                * If present, mount rootfs with passed options.
+                * Example F2FS filesystem with compress_algorithm option.
+                */
+               mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT,
+                     argc < 3 ? 0 : argv[2]);
        }
 
-       /*
-        * 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");
@@ -66,6 +75,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);
@@ -104,6 +115,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);
@@ -115,7 +128,7 @@ done(int argc, char *argv[1])
 
 int main(int argc, char **argv)
 {
-       if (argc < 2)
+       if (argc < 2) || (!strcmp(argv[1], "start"))
                return start(argc, argv);
        if (!strcmp(argv[1], "ram"))
                return ramoverlay();