From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 17 Dec 2014 19:33:28 +0000 (+0100)
Subject: block: allow mounting UBIFS partition as extroot
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=commitdiff_plain;h=1a57eb9b7cc5e772d1090a23c51fdd4a01ec5df0

block: allow mounting UBIFS partition as extroot

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---

diff --git a/block.c b/block.c
index 68cfd5a..107ba64 100644
--- 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;
 		}