block: fix ubi?_? glob pattern

[project/fstools.git] / block.c

diff --git a/block.c b/block.c
index 397db0f7e709810a50a7c443af061523f413d393..4d823e6bec562685c4b8770fab694f94271aa9dc 100644 (file)
--- a/block.c
+++ b/block.c
@@ -170,6 +170,10 @@ static const struct mount_flag mount_flags[] = {
        { "relatime",           MS_RELATIME     },
        { "norelatime",         ~MS_RELATIME    },
        { "strictatime",        MS_STRICTATIME  },
+       { "acl",                MS_POSIXACL     },
+       { "noacl",              ~MS_POSIXACL    },
+       { "nouser_xattr",       MS_NOUSER       },
+       { "user_xattr",         ~MS_NOUSER      },
 };
 
 static char *blobmsg_get_strdup(struct blob_attr *attr)
@@ -502,7 +506,7 @@ static void cache_load(int mtd)
        if (mtd) {
                _cache_load("/dev/mtdblock*");
                _cache_load("/dev/ubiblock*");
-               _cache_load("/dev/ubi?*_?*");
+               _cache_load("/dev/ubi[0-9]*");
        }
        _cache_load("/dev/mmcblk*");
        _cache_load("/dev/sd*");