block: extroot: remove unneeded rootfs tests

[project/fstools.git] / block.c

diff --git a/block.c b/block.c
index 6d187d1..a44241d 100644 (file)
--- a/block.c
+++ b/block.c
@@ -410,14 +410,16 @@ static int config_load(char *cfg)
                uci_set_confdir(ctx, path);
        }
 
-       if (uci_load(ctx, "fstab", &pkg))
-       {
-               char *err;
-               uci_get_errorstr(ctx, &err, "fstab");
-               ERROR("extroot: failed to load %s/etc/config/%s\n",
-                     cfg ? cfg : "", err);
-               free(err);
-               return -1;
+       if (uci_load(ctx, "fstab", &pkg)) {
+               uci_set_confdir(ctx, "/etc/config");
+               if (uci_load(ctx, "fstab", &pkg)) {
+                       char *err;
+                       uci_get_errorstr(ctx, &err, "fstab");
+                       ERROR("extroot: failed to load %s/etc/config/%s\n",
+                             cfg ? cfg : "", err);
+                       free(err);
+                       return -1;
+               }
        }
 
        vlist_update(&mounts);
@@ -481,6 +483,7 @@ static void cache_load(int mtd)
        if (mtd) {
                _cache_load("/dev/mtdblock*");
                _cache_load("/dev/ubiblock*");
+               _cache_load("/dev/ubi?*_?*");
        }
        _cache_load("/dev/mmcblk*");
        _cache_load("/dev/sd*");
@@ -597,6 +600,10 @@ static void check_filesystem(struct blkid_struct_probe *pr)
        struct stat statbuf;
        char *e2fsck = "/usr/sbin/e2fsck";
 
+       /* UBIFS does not need stuff like fsck */
+       if (!strncmp(pr->id->name, "ubifs", 5))
+               return;
+
        if (strncmp(pr->id->name, "ext", 3)) {
                ERROR("check_filesystem: %s is not supported\n", pr->id->name);
                return;
@@ -906,6 +913,10 @@ static int check_extroot(char *path)
                        char tag[64];
                        char uuid[64] = { 0 };
 
+                       snprintf(tag, sizeof(tag), "%s/etc", path);
+                       if (stat(tag, &s))
+                               mkdir_p(tag);
+
                        snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
                        if (stat(tag, &s)) {
                                fp = fopen(tag, "w+");
@@ -935,6 +946,9 @@ static int check_extroot(char *path)
        return -1;
 }
 
+/*
+ * Read info about extroot from UCI (using prefix) and mount it.
+ */
 static int mount_extroot(char *cfg)
 {
        char overlay[] = "/tmp/extroot/overlay";
@@ -944,9 +958,11 @@ static int mount_extroot(char *cfg)
        struct mount *m;
        int err = -1;
 
+       /* Load @cfg/etc/config/fstab */
        if (config_load(cfg))
                return -2;
 
+       /* See if there is extroot-specific mount config */
        m = find_block(NULL, NULL, NULL, "/");
        if (!m)
                m = find_block(NULL, NULL, NULL, "/overlay");
@@ -957,6 +973,7 @@ static int mount_extroot(char *cfg)
                return -1;
        }
 
+       /* Find block device pointed by the mount config */
        pr = find_block_info(m->uuid, m->label, m->device);
 
        if (!pr && delay_root){
@@ -967,7 +984,8 @@ static int mount_extroot(char *cfg)
                pr = find_block_info(m->uuid, m->label, m->device);
        }
        if (pr) {
-               if (strncmp(pr->id->name, "ext", 3)) {
+               if (strncmp(pr->id->name, "ext", 3) &&
+                   strncmp(pr->id->name, "ubifs", 5)) {
                        ERROR("extroot: %s is not supported, try ext4\n", pr->id->name);
                        return -1;
                }
@@ -998,8 +1016,7 @@ static int mount_extroot(char *cfg)
 static int main_extroot(int argc, char **argv)
 {
        struct blkid_struct_probe *pr;
-       char fs[32] = { 0 };
-       char fs_data[32] = { 0 };
+       char blkdev_path[32] = { 0 };
        int err = -1;
 #ifdef UBIFS_EXTROOT
        libubi_t libubi;
@@ -1016,36 +1033,24 @@ static int main_extroot(int argc, char **argv)
        mkblkdev();
        cache_load(1);
 
-       find_block_mtd("rootfs", fs, sizeof(fs));
-       if (!fs[0]) {
-#ifdef UBIFS_EXTROOT
-               libubi = libubi_open();
-               find_block_ubi_RO(libubi, "rootfs", fs, sizeof(fs));
-               libubi_close(libubi);
-               if (!fs[0]) {
-                       ERROR("extroot: unable to locate rootfs mtdblock / ubiblock\n");
-                       return -2;
-               }
-#else
-               ERROR("extroot: unable to locate rootfs mtdblock\n");
-               return -2;
-#endif
-       }
-
-       pr = find_block_info(NULL, NULL, fs);
-       if (!pr) {
-               ERROR("extroot: unable to retrieve rootfs information\n");
-               return -3;
-       }
+       /*
+        * Look for "rootfs_data". We will want to mount it and check for
+        * extroot configuration.
+        */
 
-       find_block_mtd("rootfs_data", fs_data, sizeof(fs_data));
-       if (fs_data[0]) {
-               pr = find_block_info(NULL, NULL, fs_data);
+       /* Start with looking for MTD partition */
+       find_block_mtd("rootfs_data", blkdev_path, sizeof(blkdev_path));
+       if (blkdev_path[0]) {
+               pr = find_block_info(NULL, NULL, blkdev_path);
                if (pr && !strcmp(pr->id->name, "jffs2")) {
                        char cfg[] = "/tmp/jffs_cfg";
 
+                       /*
+                        * Mount MTD part and try extroot (using
+                        * /etc/config/fstab from that partition)
+                        */
                        mkdir_p(cfg);
-                       if (!mount(fs_data, cfg, "jffs2", MS_NOATIME, NULL)) {
+                       if (!mount(blkdev_path, cfg, "jffs2", MS_NOATIME, NULL)) {
                                err = mount_extroot(cfg);
                                umount2(cfg, MNT_DETACH);
                        }
@@ -1057,15 +1062,17 @@ static int main_extroot(int argc, char **argv)
        }
 
 #ifdef UBIFS_EXTROOT
-       memset(fs_data, 0, sizeof(fs_data));
+       /* ... but it also could be an UBI volume */
+       memset(blkdev_path, 0, sizeof(blkdev_path));
        libubi = libubi_open();
-       find_block_ubi(libubi, "rootfs_data", fs_data, sizeof(fs_data));
+       find_block_ubi(libubi, "rootfs_data", blkdev_path, sizeof(blkdev_path));
        libubi_close(libubi);
-       if (fs_data[0]) {
+       if (blkdev_path[0]) {
                char cfg[] = "/tmp/ubifs_cfg";
 
+               /* Mount volume and try extroot (using fstab from that vol) */
                mkdir_p(cfg);
-               if (!mount(fs_data, cfg, "ubifs", MS_NOATIME, NULL)) {
+               if (!mount(blkdev_path, cfg, "ubifs", MS_NOATIME, NULL)) {
                        err = mount_extroot(cfg);
                        umount2(cfg, MNT_DETACH);
                }