block: extroot: remove unneeded rootfs tests

[project/fstools.git] / block.c

diff --git a/block.c b/block.c
index 107ba64..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);
@@ -911,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+");
@@ -1010,7 +1016,6 @@ static int mount_extroot(char *cfg)
 static int main_extroot(int argc, char **argv)
 {
        struct blkid_struct_probe *pr;
-       char fs[32] = { 0 };
        char blkdev_path[32] = { 0 };
        int err = -1;
 #ifdef UBIFS_EXTROOT
@@ -1029,32 +1034,6 @@ static int main_extroot(int argc, char **argv)
        cache_load(1);
 
        /*
-        * Make sure there is "rootfs" MTD partition or UBI volume.
-        * TODO: What for?
-        */
-       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.
         */