From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 28 Jul 2021 16:30:31 +0000 (+0100)
Subject: block: don't add non-ubifs ubi devices
X-Git-Url: http://git.openwrt.org/?p=project%2Ffstools.git;a=commitdiff_plain;h=46d02c2289e25460ec2f0d3c4e5c5eb7ab158119

block: don't add non-ubifs ubi devices

As they require ubiblock to be mounted, just skip ubi devices in case
they don't contain a ubifs.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/block.c b/block.c
index c9b61af..d839838 100644
--- a/block.c
+++ b/block.c
@@ -483,19 +483,27 @@ static int config_load(char *cfg)
 
 static struct probe_info* _probe_path(char *path)
 {
-	struct probe_info *pr;
+	struct probe_info *pr, *epr;
 	char tmppath[64];
 
-	/* skip ubi device if ubiblock device is present */
+	pr = probe_path(path);
+	if (!pr)
+		return NULL;
+
 	if (path[5] == 'u' && path[6] == 'b' && path[7] == 'i' &&
 	    path[8] >= '0' && path[8] <= '9' ) {
+		/* skip ubi device if not UBIFS (as it requires ubiblock) */
+		if (strcmp("ubifs", pr->type))
+			return NULL;
+
+		/* skip ubi device if ubiblock device is present */
 		snprintf(tmppath, sizeof(tmppath), "/dev/ubiblock%s", path + 8);
-		list_for_each_entry(pr, &devices, list)
-			if (!strcasecmp(pr->dev, tmppath))
+		list_for_each_entry(epr, &devices, list)
+			if (!strcmp(epr->dev, tmppath))
 				return NULL;
 	}
 
-	return probe_path(path);
+	return pr;
 }
 
 static int _cache_load(const char *path)