#include <sys/mount.h>
#include <sys/wait.h>
+#include <linux/fs.h>
+
#include <uci.h>
#include <uci_blob.h>
#include <libubox/blobmsg_json.h>
#include <libubox/avl-cmp.h>
-#include "libblkid-tiny/libblkid-tiny.h"
+#include "probe.h"
#ifdef UBIFS_EXTROOT
#include "libubi/libubi.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)
return 0;
}
-static struct blkid_struct_probe* _probe_path(char *path)
+static struct probe_info* _probe_path(char *path)
{
- struct blkid_struct_probe *pr;
-
- pr = malloc(sizeof(*pr));
-
- if (!pr)
- return NULL;
+ struct probe_info *pr;
+ char tmppath[64];
- memset(pr, 0, sizeof(*pr));
- probe_block(path, pr);
-
- if (pr->err || !pr->id) {
- free(pr);
- return NULL;
+ /* 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;
}
- return pr;
+ return probe_path(path);
}
static int _cache_load(const char *path)
return -1;
for (j = 0; j < gl.gl_pathc; j++) {
- struct blkid_struct_probe *pr = _probe_path(gl.gl_pathv[j]);
+ struct probe_info *pr = _probe_path(gl.gl_pathv[j]);
if (pr)
list_add_tail(&pr->list, &devices);
}
if (mtd) {
_cache_load("/dev/mtdblock*");
_cache_load("/dev/ubiblock*");
- _cache_load("/dev/ubi?*_?*");
+ _cache_load("/dev/ubi[0-9]*");
}
+ _cache_load("/dev/loop*");
_cache_load("/dev/mmcblk*");
_cache_load("/dev/sd*");
_cache_load("/dev/hd*");
_cache_load("/dev/mapper/*");
}
-static int print_block_info(struct blkid_struct_probe *pr)
-{
- printf("%s:", pr->dev);
- if (pr->uuid[0])
- printf(" UUID=\"%s\"", pr->uuid);
-
- if (pr->label[0])
- printf(" LABEL=\"%s\"", pr->label);
-
- if (pr->name[0])
- printf(" NAME=\"%s\"", pr->name);
-
- if (pr->version[0])
- printf(" VERSION=\"%s\"", pr->version);
-
- printf(" TYPE=\"%s\"\n", pr->id->name);
- return 0;
-}
-
-static int print_block_uci(struct blkid_struct_probe *pr)
+static int print_block_uci(struct probe_info *pr)
{
- if (!strcmp(pr->id->name, "swap")) {
+ if (!strcmp(pr->type, "swap")) {
printf("config 'swap'\n");
} else {
printf("config 'mount'\n");
printf("\toption\ttarget\t'/mnt/%s'\n", basename(pr->dev));
}
- if (pr->uuid[0])
+ if (pr->uuid)
printf("\toption\tuuid\t'%s'\n", pr->uuid);
else
printf("\toption\tdevice\t'%s'\n", pr->dev);
return 0;
}
-static struct blkid_struct_probe* find_block_info(char *uuid, char *label, char *path)
+static struct probe_info* find_block_info(char *uuid, char *label, char *path)
{
- struct blkid_struct_probe *pr = NULL;
+ struct probe_info *pr = NULL;
if (uuid)
list_for_each_entry(pr, &devices, list)
- if (!strcasecmp(pr->uuid, uuid))
+ if (pr->uuid && !strcasecmp(pr->uuid, uuid))
return pr;
if (label)
list_for_each_entry(pr, &devices, list)
- if (!strcmp(pr->label, label))
+ if (pr->label && !strcmp(pr->label, label))
return pr;
if (path)
list_for_each_entry(pr, &devices, list)
- if (!strcmp(basename(pr->dev), basename(path)))
+ if (pr->dev && !strcmp(basename(pr->dev), basename(path)))
return pr;
return NULL;
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;
+ int rstat;
+ unsigned int minor, major;
- if(!fp)
+ if (!fp)
return NULL;
+ rstat = stat(block, &s);
+
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 (rstat)
+ continue;
+
+ if (!S_ISBLK(s.st_mode))
+ continue;
+
+ if (major == major(s.st_rdev) &&
+ minor == minor(s.st_rdev)) {
+ point = strdup(cpoint);
break;
}
}
return point;
}
+static int print_block_info(struct probe_info *pr)
+{
+ static char *mp;
+
+ mp = find_mount_point(pr->dev);
+ printf("%s:", pr->dev);
+ if (pr->uuid)
+ printf(" UUID=\"%s\"", pr->uuid);
+
+ if (pr->label)
+ printf(" LABEL=\"%s\"", pr->label);
+
+ if (pr->version)
+ printf(" VERSION=\"%s\"", pr->version);
+
+ if (mp) {
+ printf(" MOUNT=\"%s\"", mp);
+ free(mp);
+ }
+
+ printf(" TYPE=\"%s\"\n", pr->type);
+
+ return 0;
+}
+
static void mkdir_p(char *dir)
{
char *l = strrchr(dir, '/');
}
}
-static void check_filesystem(struct blkid_struct_probe *pr)
+static void check_filesystem(struct probe_info *pr)
{
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))
+ if (!strncmp(pr->type, "ubifs", 5))
return;
- if (strncmp(pr->id->name, "ext", 3)) {
- ULOG_ERR("check_filesystem: %s is not supported\n", pr->id->name);
+ if (!strncmp(pr->type, "vfat", 4)) {
+ ckfs = dosfsck;
+ } else if (!strncmp(pr->type, "ext", 3)) {
+ ckfs = e2fsck;
+ } else {
+ ULOG_ERR("check_filesystem: %s is not supported\n", pr->type);
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 stat s;
struct mount *m;
- struct blkid_struct_probe *pr;
+ struct probe_info *pr;
vlist_for_each_element(&mounts, m, node)
{
if (!pr)
continue;
- if (!strcmp(pr->id->name, "swap")) {
+ if (!strcmp(pr->type, "swap")) {
if (on)
swapon(pr->dev, m->prio);
else
}
}
-static int mount_device(struct blkid_struct_probe *pr, int hotplug)
+static int mount_device(struct probe_info *pr, int hotplug)
{
struct mount *m;
char *device;
+ char *mp;
if (!pr)
return -1;
device = basename(pr->dev);
- if (!strcmp(pr->id->name, "swap")) {
+ if (!strcmp(pr->type, "swap")) {
if (hotplug && !auto_swap)
return -1;
m = find_swap(pr->uuid, pr->label, device);
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 (check_fs)
check_filesystem(pr);
- err = mount(pr->dev, target, pr->id->name, m->flags,
+ err = mount(pr->dev, target, pr->type, m->flags,
(m->options) ? (m->options) : (""));
if (err)
ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n",
- pr->dev, pr->id->name, target, err, strerror(err));
+ pr->dev, pr->type, target, err, strerror(err));
else
handle_swapfiles(true);
return err;
}
if (anon_mount) {
- char target[] = "/mnt/mmcblk123";
+ char target[32];
int err = 0;
snprintf(target, sizeof(target), "/mnt/%s", device);
if (check_fs)
check_filesystem(pr);
- err = mount(pr->dev, target, pr->id->name, 0, "");
+ err = mount(pr->dev, target, pr->type, 0, "");
if (err)
ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n",
- pr->dev, pr->id->name, target, err, strerror(err));
+ pr->dev, pr->type, target, err, strerror(err));
else
handle_swapfiles(true);
return err;
return 0;
}
-static int umount_device(struct blkid_struct_probe *pr)
+static int umount_device(struct probe_info *pr)
{
struct mount *m;
char *device = basename(pr->dev);
if (!pr)
return -1;
- if (!strcmp(pr->id->name, "swap"))
+ if (!strcmp(pr->type, "swap"))
return -1;
mp = find_mount_point(pr->dev);
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);
static int check_extroot(char *path)
{
- struct blkid_struct_probe *pr = NULL;
+ struct probe_info *pr = NULL;
char devpath[32];
#ifdef UBIFS_EXTROOT
tag, errno, strerror(errno));
fclose(fp);
- if (*uuid || !strcasecmp(uuid, pr->uuid))
+ if (*uuid && !strcasecmp(uuid, pr->uuid))
return 0;
ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n",
char overlay[] = "/tmp/extroot/overlay";
char mnt[] = "/tmp/extroot/mnt";
char *path = mnt;
- struct blkid_struct_probe *pr;
+ struct probe_info *pr;
struct mount *m;
int err = -1;
if (!pr && delay_root){
ULOG_INFO("extroot: device not present, retrying in %u seconds\n", delay_root);
sleep(delay_root);
- mkblkdev();
+ make_devs();
cache_load(0);
pr = find_block_info(m->uuid, m->label, m->device);
}
if (pr) {
- if (strncmp(pr->id->name, "ext", 3) &&
- strncmp(pr->id->name, "ubifs", 5)) {
- ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->id->name);
+ if (strncmp(pr->type, "ext", 3) &&
+ strncmp(pr->type, "ubifs", 5)) {
+ ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->type);
return -1;
}
- if (test_fs_support(pr->id->name)) {
- ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->id->name);
+ if (test_fs_support(pr->type)) {
+ ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->type);
return -1;
}
if (check_fs)
check_filesystem(pr);
- err = mount(pr->dev, path, pr->id->name, 0, (m->options) ? (m->options) : (""));
+ err = mount(pr->dev, path, pr->type, m->flags,
+ (m->options) ? (m->options) : (""));
if (err) {
ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%s)\n",
- pr->dev, pr->id->name, path, err, strerror(err));
+ pr->dev, pr->type, path, err, strerror(err));
} else if (m->overlay) {
err = check_extroot(path);
if (err)
static int main_extroot(int argc, char **argv)
{
- struct blkid_struct_probe *pr;
+ struct probe_info *pr;
char blkdev_path[32] = { 0 };
int err = -1;
#ifdef UBIFS_EXTROOT
return -1;
}
- mkblkdev();
+ make_devs();
cache_load(1);
/* enable LOG_INFO messages */
find_block_mtd("\"rootfs_data\"", blkdev_path, sizeof(blkdev_path));
if (blkdev_path[0]) {
pr = find_block_info(NULL, NULL, blkdev_path);
- if (pr && !strcmp(pr->id->name, "jffs2")) {
+ if (pr && !strcmp(pr->type, "jffs2")) {
char cfg[] = "/tmp/jffs_cfg";
/*
static int main_mount(int argc, char **argv)
{
- struct blkid_struct_probe *pr;
+ struct probe_info *pr;
if (config_load(NULL))
return -1;
static int main_umount(int argc, char **argv)
{
- struct blkid_struct_probe *pr;
+ struct probe_info *pr;
if (config_load(NULL))
return -1;
static int main_detect(int argc, char **argv)
{
- struct blkid_struct_probe *pr;
+ struct probe_info *pr;
cache_load(0);
printf("config 'global'\n");
static int main_info(int argc, char **argv)
{
int i;
- struct blkid_struct_probe *pr;
+ struct probe_info *pr;
cache_load(1);
if (argc == 2) {
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;
}
FILE *fp;
char *lineptr;
size_t s;
- struct blkid_struct_probe *pr;
+ struct probe_info *pr;
int flags = 0;
int pri;
struct stat st;
case 'a':
cache_load(0);
list_for_each_entry(pr, &devices, list) {
- if (strcmp(pr->id->name, "swap"))
+ if (strcmp(pr->type, "swap"))
continue;
if (swapon(pr->dev, 0))
ULOG_ERR("failed to swapon %s\n", pr->dev);
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");