libfstools: fit: improve fit_volume_find string handling

[project/fstools.git] / mount_root.c

diff --git a/mount_root.c b/mount_root.c
index aaafecad506407544710f0ff70e81e312015f628..c8ffe58753b55b35feed1701ee93e6a6d07b3d47 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -28,7 +28,7 @@
  * 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");
@@ -40,17 +40,21 @@ start(int argc, char *argv[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;
        }
@@ -71,6 +75,7 @@ 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:
@@ -110,6 +115,7 @@ 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:
@@ -122,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();