#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*");
static char* find_mount_point(char *block)
{
- FILE *fp = fopen("/proc/mounts", "r");
+ FILE *fp = fopen("/proc/self/mountinfo", "r");
static char line[256];
int len = strlen(block);
- char *point = NULL;
+ char *point = NULL, *pos, *tmp, *cpoint, *devname;
+ struct stat s;
+ unsigned int minor, major;
- if(!fp)
+ if (!fp)
+ return NULL;
+
+ if (stat(block, &s))
return NULL;
while (fgets(line, sizeof(line), fp)) {
- if (!strncmp(line, block, len)) {
- char *p = &line[len + 1];
- char *t = strstr(p, " ");
+ pos = strchr(line, ' ');
+ if (!pos)
+ continue;
- if (!t) {
- fclose(fp);
- return NULL;
- }
- *t = '\0';
- point = p;
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+
+ tmp = ++pos;
+ pos = strchr(pos, ':');
+ if (!pos)
+ continue;
+
+ *pos = '\0';
+ major = atoi(tmp);
+ tmp = ++pos;
+ pos = strchr(pos, ' ');
+ if (!pos)
+ continue;
+
+ *pos = '\0';
+ minor = atoi(tmp);
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+ tmp = ++pos;
+
+ pos = strchr(pos, ' ');
+ if (!pos)
+ continue;
+ *pos = '\0';
+ cpoint = tmp;
+
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+
+ pos = strchr(pos + 1, ' ');
+ if (!pos)
+ continue;
+
+ tmp = ++pos;
+ pos = strchr(pos, ' ');
+ if (!pos)
+ continue;
+
+ *pos = '\0';
+ devname = tmp;
+ if (!strncmp(block, devname, len)) {
+ point = strdup(cpoint);
+ break;
+ }
+
+ if (!S_ISBLK(s.st_mode))
+ continue;
+
+ if (major == major(s.st_rdev) &&
+ minor == minor(s.st_rdev)) {
+ point = strdup(cpoint);
break;
}
}
{
pid_t pid;
struct stat statbuf;
- char *e2fsck = "/usr/sbin/e2fsck";
+ const char *e2fsck = "/usr/sbin/e2fsck";
+ const char *dosfsck = "/usr/sbin/dosfsck";
+ const char *ckfs;
/* UBIFS does not need stuff like fsck */
if (!strncmp(pr->id->name, "ubifs", 5))
return;
- if (strncmp(pr->id->name, "ext", 3)) {
+ if (!strncmp(pr->id->name, "vfat", 4)) {
+ ckfs = dosfsck;
+ } else if (!strncmp(pr->id->name, "ext", 3)) {
+ ckfs = e2fsck;
+ } else {
ULOG_ERR("check_filesystem: %s is not supported\n", pr->id->name);
return;
}
- if (stat(e2fsck, &statbuf) < 0) {
- ULOG_ERR("check_filesystem: %s not found\n", e2fsck);
+ if (stat(ckfs, &statbuf) < 0) {
+ ULOG_ERR("check_filesystem: %s not found\n", ckfs);
return;
}
pid = fork();
if (!pid) {
- execl(e2fsck, e2fsck, "-p", pr->dev, NULL);
+ execl(ckfs, ckfs, "-p", pr->dev, NULL);
exit(-1);
} else if (pid > 0) {
int status;
waitpid(pid, &status, 0);
if (WEXITSTATUS(status))
- ULOG_ERR("check_filesystem: %s returned %d\n", e2fsck, WEXITSTATUS(status));
+ ULOG_ERR("check_filesystem: %s returned %d\n", ckfs, WEXITSTATUS(status));
}
}
{
struct mount *m;
char *device;
+ char *mp;
if (!pr)
return -1;
if (hotplug && !auto_mount)
return -1;
- if (find_mount_point(pr->dev)) {
- ULOG_ERR("%s is already mounted\n", pr->dev);
+ mp = find_mount_point(pr->dev);
+ if (mp) {
+ ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
+ free(mp);
return -1;
}
}
if (anon_mount) {
- char target[] = "/mnt/mmcblk123";
+ char target[32];
int err = 0;
snprintf(target, sizeof(target), "/mnt/%s", device);
ULOG_INFO("unmounted %s (%s)\n",
pr->dev, mp);
+ free(mp);
return err;
}
ULOG_ERR("umount of %s failed (%d) - %s\n",
mount_point, err, strerror(err));
+ free(mount_point);
return 0;
} else if (strcmp(action, "add")) {
ULOG_ERR("Unkown action %s\n", action);
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;
}
if (!strcmp(argv[1], "umount"))
return main_umount(argc, argv);
+
+ if (!strcmp(argv[1], "remount")) {
+ int ret = main_umount(argc, argv);
+
+ if (!ret)
+ ret = main_mount(argc, argv);
+ return ret;
+ }
}
ULOG_ERR("Usage: block <info|mount|umount|detect>\n");