#include <sys/mount.h>
#include <sys/wait.h>
+#include <linux/fs.h>
+
#include <uci.h>
#include <uci_blob.h>
int32_t flag;
};
-#ifndef MS_DIRSYNC
-# define MS_DIRSYNC (1 << 7)
-#endif
-
-#ifndef MS_RELATIME
-# define MS_RELATIME (1 << 21)
-#endif
-
-#ifndef MS_STRICTATIME
-# define MS_STRICTATIME (1 << 24)
-#endif
-
static const struct mount_flag mount_flags[] = {
{ "sync", MS_SYNCHRONOUS },
{ "async", ~MS_SYNCHRONOUS },
{ "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)
static struct blkid_struct_probe* _probe_path(char *path)
{
struct blkid_struct_probe *pr;
+ char tmppath[64];
+
+ /* skip ubi device if ubiblock device is present */
+ if (path[5] == 'u' && path[6] == 'b' && path[7] == 'i' &&
+ path[8] >= '0' && path[8] <= '9' ) {
+ snprintf(tmppath, sizeof(tmppath), "/dev/ubiblock%s", path + 8);
+ list_for_each_entry(pr, &devices, list)
+ if (!strcasecmp(pr->dev, tmppath))
+ return NULL;
+ }
pr = malloc(sizeof(*pr));
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*");
ULOG_ERR("failed to stat %s\n", argv[i]);
continue;
}
- if (!S_ISBLK(s.st_mode)) {
+ if (!S_ISBLK(s.st_mode) && !(S_ISCHR(s.st_mode) && major(s.st_rdev) == 250)) {
ULOG_ERR("%s is not a block device\n", argv[i]);
continue;
}