aboutsummaryrefslogtreecommitdiff
path: root/util-linux/volume_id/get_devname.c
diff options
context:
space:
mode:
authorSerj Kalichev <serj.kalichev@gmail.com>2016-08-29 18:28:34 +0300
committerDenys Vlasenko <vda.linux@googlemail.com>2016-09-06 18:31:01 +0200
commitd42cdc2222d08fcc5ad8251ecf7a00454cb0c419 (patch)
tree6ef6177bb6f2026eb59c14f919f3e54c6c16495d /util-linux/volume_id/get_devname.c
parent9fd61be191caf78138a50e9d6a465b39318f91c3 (diff)
downloadbusybox-d42cdc2222d08fcc5ad8251ecf7a00454cb0c419.tar.gz
volume_id: Add support for UBIFS
Signed-off-by: Serj Kalichev <serj.kalichev@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/volume_id/get_devname.c')
-rw-r--r--util-linux/volume_id/get_devname.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 6b97df113..b64d28ceb 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -107,7 +107,11 @@ uuidcache_check_device(const char *device,
int depth UNUSED_PARAM)
{
/* note: this check rejects links to devices, among other nodes */
- if (!S_ISBLK(statbuf->st_mode))
+ if (!S_ISBLK(statbuf->st_mode)
+#if ENABLE_FEATURE_VOLUMEID_UBIFS
+ && !(S_ISCHR(statbuf->st_mode) && strncmp(bb_basename(device), "ubi", 3) == 0)
+#endif
+ )
return TRUE;
/* Users report that mucking with floppies (especially non-present