block: allow mounting UBIFS partition as extroot
authorRafał Miłecki <zajec5@gmail.com>
Wed, 17 Dec 2014 19:33:28 +0000 (20:33 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 6 Jan 2015 10:52:20 +0000 (11:52 +0100)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
block.c

diff --git a/block.c b/block.c
index 68cfd5a5a89207a7e03b438dff4ae0cfbd242521..107ba64d75b3545070a59b284d74c794ce0f0d69 100644 (file)
--- a/block.c
+++ b/block.c
@@ -598,6 +598,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;
@@ -974,7 +978,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;
                }