diff mbox

[OpenWrt-Devel,fstools] support UBI blocks (volumes)

Message ID 1418838424-9486-1-git-send-email-zajec5@gmail.com
State Accepted
Headers show

Commit Message

Rafał Miłecki Dec. 17, 2014, 5:47 p.m. UTC 
We already had ubifs idinfo, so only /dev/ubiN_M support was missing.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 block.c                       | 1 +
 libblkid-tiny/libblkid-tiny.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/block.c b/block.c
index bba68c2..68cfd5a 100644
--- a/block.c
+++ b/block.c
@@ -481,6 +481,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*");
diff --git a/libblkid-tiny/libblkid-tiny.c b/libblkid-tiny/libblkid-tiny.c
index a01a43e..1e641f7 100644
--- a/libblkid-tiny/libblkid-tiny.c
+++ b/libblkid-tiny/libblkid-tiny.c
@@ -174,7 +174,7 @@  int probe_block(char *block, struct blkid_struct_probe *pr)
 	struct stat s;
 	int i;
 
-	if (stat(block, &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode)))
+	if (stat(block, &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode) && !strncmp(block, "ubi", 3)))
 		return -1;
 
 	pr->err = -1;