#include <dirent.h>
#include <stdarg.h>
#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/swap.h>
#include <sys/mount.h>
#include <sys/wait.h>
+#include <sys/sysmacros.h>
+
+#include <linux/fs.h>
#include <uci.h>
#include <uci_blob.h>
#include <libubox/vlist.h>
#include <libubox/blobmsg_json.h>
#include <libubox/avl-cmp.h>
+#include <libubus.h>
+
+#include "probe.h"
-#include "libblkid-tiny/libblkid-tiny.h"
+#define AUTOFS_MOUNT_PATH "/tmp/run/blockd/"
#ifdef UBIFS_EXTROOT
#include "libubi/libubi.h"
TYPE_SWAP,
};
+enum {
+ TYPE_DEV,
+ TYPE_HOTPLUG,
+ TYPE_AUTOFS,
+};
+
struct mount {
struct vlist_node node;
int type;
char *label;
char *device;
int extroot;
+ int autofs;
int overlay;
int disabled_fsck;
unsigned int prio;
MOUNT_TARGET,
MOUNT_DEVICE,
MOUNT_OPTIONS,
+ MOUNT_AUTOFS,
__MOUNT_MAX
};
[MOUNT_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
[MOUNT_OPTIONS] = { .name = "options", .type = BLOBMSG_TYPE_STRING },
[MOUNT_ENABLE] = { .name = "enabled", .type = BLOBMSG_TYPE_INT32 },
+ [MOUNT_AUTOFS] = { .name = "autofs", .type = BLOBMSG_TYPE_INT32 },
};
static const struct uci_blob_param_list mount_attr_list = {
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)
struct blob_attr *tb[__MOUNT_MAX] = { 0 };
struct mount *m;
- blob_buf_init(&b, 0);
+ blob_buf_init(&b, 0);
uci_to_blob(&b, s, &mount_attr_list);
blobmsg_parse(mount_policy, __MOUNT_MAX, tb, blob_data(b.head), blob_len(b.head));
m->label = blobmsg_get_strdup(tb[MOUNT_LABEL]);
m->target = blobmsg_get_strdup(tb[MOUNT_TARGET]);
m->device = blobmsg_get_basename(tb[MOUNT_DEVICE]);
-
+ if (tb[MOUNT_AUTOFS])
+ m->autofs = blobmsg_get_u32(tb[MOUNT_AUTOFS]);
+ else
+ m->autofs = 0;
parse_mount_options(m, blobmsg_get_strdup(tb[MOUNT_OPTIONS]));
m->overlay = m->extroot = 0;
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/md*");
_cache_load("/dev/vd*");
+ _cache_load("/dev/xvd*");
_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 *f2fsck = "/usr/sbin/fsck.f2fs";
+ const char *dosfsck = "/usr/sbin/dosfsck";
+ const char *btrfsck = "/usr/bin/btrfsck";
+ 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, "f2fs", 4)) {
+ ckfs = f2fsck;
+ } else if (!strncmp(pr->type, "ext", 3)) {
+ ckfs = e2fsck;
+ } else if (!strncmp(pr->type, "btrfs", 5)) {
+ ckfs = btrfsck;
+ } 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);
- exit(-1);
+ if(!strncmp(pr->type, "f2fs", 4)) {
+ execl(ckfs, ckfs, "-f", pr->dev, NULL);
+ exit(-1);
+ } else if(!strncmp(pr->type, "btrfs", 5)) {
+ execl(ckfs, ckfs, "--repair", pr->dev, NULL);
+ exit(-1);
+ } else {
+ 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 void to_devnull(int fd)
+{
+ int devnull = open("/dev/null", fd ? O_WRONLY : O_RDONLY);
+
+ if (devnull >= 0)
+ dup2(devnull, fd);
+
+ if (devnull > STDERR_FILENO)
+ close(devnull);
+}
+
+static int exec_mount(const char *source, const char *target,
+ const char *fstype, const char *options)
+{
+ pid_t pid;
+ struct stat s;
+ FILE *mount_fd;
+ int err, status, pfds[2];
+ char errmsg[128], cmd[sizeof("/sbin/mount.XXXXXXXXXXXXXXXX\0")];
+
+ snprintf(cmd, sizeof(cmd), "/sbin/mount.%s", fstype);
+
+ if (stat(cmd, &s) < 0 || !S_ISREG(s.st_mode) || !(s.st_mode & S_IXUSR)) {
+ ULOG_ERR("No \"mount.%s\" utility available\n", fstype);
+ return -1;
+ }
+
+ if (pipe(pfds) < 0)
+ return -1;
+
+ fcntl(pfds[0], F_SETFD, fcntl(pfds[0], F_GETFD) | FD_CLOEXEC);
+ fcntl(pfds[1], F_SETFD, fcntl(pfds[1], F_GETFD) | FD_CLOEXEC);
+
+ pid = vfork();
+
+ switch (pid) {
+ case -1:
+ close(pfds[0]);
+ close(pfds[1]);
+
+ return -1;
+
+ case 0:
+ to_devnull(STDIN_FILENO);
+ to_devnull(STDOUT_FILENO);
+
+ dup2(pfds[1], STDERR_FILENO);
+ close(pfds[0]);
+ close(pfds[1]);
+
+ if (options && *options)
+ execl(cmd, cmd, "-o", options, source, target, NULL);
+ else
+ execl(cmd, cmd, source, target, NULL);
+
+ return -1;
+
+ default:
+ close(pfds[1]);
+
+ mount_fd = fdopen(pfds[0], "r");
+
+ while (fgets(errmsg, sizeof(errmsg), mount_fd))
+ ULOG_ERR("mount.%s: %s", fstype, errmsg);
+
+ fclose(mount_fd);
+
+ err = waitpid(pid, &status, 0);
+
+ if (err != -1) {
+ if (status != 0) {
+ ULOG_ERR("mount.%s: failed with status %d\n", fstype, status);
+ errno = EINVAL;
+ err = -1;
+ } else {
+ errno = 0;
+ err = 0;
+ }
+ }
+
+ break;
+ }
+
+ return err;
+}
+
+static int handle_mount(const char *source, const char *target,
+ const char *fstype, struct mount *m)
+{
+ int i, err;
+ size_t mount_opts_len;
+ char *mount_opts = NULL, *ptr;
+
+ err = mount(source, target, fstype, m ? m->flags : 0,
+ (m && m->options) ? m->options : "");
+
+ /* Requested file system type is not available in kernel,
+ attempt to call mount helper. */
+ if (err == -1 && errno == ENODEV) {
+ if (m) {
+ /* Convert mount flags back into string representation,
+ first calculate needed length of string buffer... */
+ mount_opts_len = 1 + (m->options ? strlen(m->options) : 0);
+
+ for (i = 0; i < ARRAY_SIZE(mount_flags); i++)
+ if ((mount_flags[i].flag > 0) &&
+ (mount_flags[i].flag < INT_MAX) &&
+ (m->flags & (uint32_t)mount_flags[i].flag))
+ mount_opts_len += strlen(mount_flags[i].name) + 1;
+
+ /* ... then now allocate and fill it ... */
+ ptr = mount_opts = calloc(1, mount_opts_len);
+
+ if (!ptr) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ if (m->options)
+ ptr += sprintf(ptr, "%s,", m->options);
+
+ for (i = 0; i < ARRAY_SIZE(mount_flags); i++)
+ if ((mount_flags[i].flag > 0) &&
+ (mount_flags[i].flag < INT_MAX) &&
+ (m->flags & (uint32_t)mount_flags[i].flag))
+ ptr += sprintf(ptr, "%s,", mount_flags[i].name);
+
+ mount_opts[mount_opts_len - 1] = 0;
+ }
+
+ /* ... and now finally invoke the external mount program */
+ err = exec_mount(source, target, fstype, mount_opts);
+ }
+
+ return err;
+}
+
+static void blockd_notify(char *device, struct mount *m, struct probe_info *pr)
+{
+ struct ubus_context *ctx = ubus_connect(NULL);
+ uint32_t id;
+
+ if (!ctx)
+ return;
+
+ if (!ubus_lookup_id(ctx, "block", &id)) {
+ struct blob_buf buf = { 0 };
+ char *d = strrchr(device, '/');
+
+ if (d)
+ d++;
+ else
+ d = device;
+
+ blob_buf_init(&buf, 0);
+
+ if (m) {
+
+ blobmsg_add_string(&buf, "device", d);
+ if (m->uuid)
+ blobmsg_add_string(&buf, "uuid", m->uuid);
+ if (m->label)
+ blobmsg_add_string(&buf, "label", m->label);
+ if (m->target)
+ blobmsg_add_string(&buf, "target", m->target);
+ if (m->options)
+ blobmsg_add_string(&buf, "options", m->options);
+ if (m->autofs)
+ blobmsg_add_u32(&buf, "autofs", m->autofs);
+ if (pr->type)
+ blobmsg_add_string(&buf, "type", pr->type);
+ if (pr->version)
+ blobmsg_add_string(&buf, "version", pr->version);
+ } else if (pr) {
+ blobmsg_add_string(&buf, "device", d);
+ if (pr->uuid)
+ blobmsg_add_string(&buf, "uuid", pr->uuid);
+ if (pr->label)
+ blobmsg_add_string(&buf, "label", pr->label);
+ if (pr->type)
+ blobmsg_add_string(&buf, "type", pr->type);
+ if (pr->version)
+ blobmsg_add_string(&buf, "version", pr->version);
+ blobmsg_add_u32(&buf, "anon", 1);
+ } else {
+ blobmsg_add_string(&buf, "device", d);
+ blobmsg_add_u32(&buf, "remove", 1);
+ }
+
+ ubus_invoke(ctx, id, "hotplug", buf.head, NULL, NULL, 3000);
+ }
+
+ ubus_free(ctx);
+}
+
+static int mount_device(struct probe_info *pr, int type)
{
struct mount *m;
char *device;
+ char *mp;
if (!pr)
return -1;
device = basename(pr->dev);
- if (!strcmp(pr->id->name, "swap")) {
- if (hotplug && !auto_swap)
+ if (!strcmp(pr->type, "swap")) {
+ if ((type == TYPE_HOTPLUG) && !auto_swap)
return -1;
m = find_swap(pr->uuid, pr->label, device);
if (m || anon_swap)
return 0;
}
- 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 && (type != TYPE_HOTPLUG)) {
+ ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
+ free(mp);
return -1;
}
if (m && m->extroot)
return -1;
+ if (m) switch (type) {
+ case TYPE_HOTPLUG:
+ blockd_notify(device, m, pr);
+ if (m->autofs)
+ return 0;
+ if (!auto_mount)
+ return -1;
+ break;
+ case TYPE_AUTOFS:
+ if (!m->autofs)
+ return -1;
+ break;
+ case TYPE_DEV:
+ if (m->autofs)
+ return -1;
+ break;
+ } else if (type == TYPE_HOTPLUG) {
+ blockd_notify(device, NULL, pr);
+ }
+
if (m) {
char *target = m->target;
char _target[32];
int err = 0;
+ if (m->autofs) {
+ snprintf(_target, sizeof(_target), "/tmp/run/blockd/%s", device);
+ target = _target;
+ }
if (!target) {
snprintf(_target, sizeof(_target), "/mnt/%s", device);
target = _target;
if (check_fs)
check_filesystem(pr);
- err = mount(pr->dev, target, pr->id->name, m->flags,
- (m->options) ? (m->options) : (""));
+ err = handle_mount(pr->dev, target, pr->type, m);
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, errno, strerror(errno));
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 = handle_mount(pr->dev, target, pr->type, NULL);
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, errno, strerror(errno));
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);
err = umount2(mp, MNT_DETACH);
if (err)
ULOG_ERR("unmounting %s (%s) failed (%d) - %s\n",
- pr->dev, mp, err, strerror(err));
+ pr->dev, mp, errno, strerror(errno));
else
ULOG_INFO("unmounted %s (%s)\n",
pr->dev, mp);
+ free(mp);
return err;
}
-static int main_hotplug(int argc, char **argv)
+static int mount_action(char *action, char *device, int type)
{
char path[32];
- char *action, *device, *mount_point;
-
- action = getenv("ACTION");
- device = getenv("DEVNAME");
+ char *mount_point;
if (!action || !device)
return -1;
if (!strcmp(action, "remove")) {
int err = 0;
+
+ if (type == TYPE_HOTPLUG)
+ blockd_notify(device, NULL, NULL);
+
mount_point = find_mount_point(path);
if (mount_point)
err = umount2(mount_point, MNT_DETACH);
if (err)
ULOG_ERR("umount of %s failed (%d) - %s\n",
- mount_point, err, strerror(err));
+ mount_point, errno, strerror(errno));
+ free(mount_point);
return 0;
} else if (strcmp(action, "add")) {
ULOG_ERR("Unkown action %s\n", action);
return -1;
cache_load(0);
- return mount_device(find_block_info(NULL, NULL, path), 1);
+ return mount_device(find_block_info(NULL, NULL, path), type);
+}
+
+static int main_hotplug(int argc, char **argv)
+{
+ return mount_action(getenv("ACTION"), getenv("DEVNAME"), TYPE_HOTPLUG);
+}
+
+static int main_autofs(int argc, char **argv)
+{
+ if (argc < 3)
+ return -1;
+
+ if (!strcmp(argv[2], "start")) {
+ struct probe_info *pr;
+
+ if (config_load(NULL))
+ return -1;
+
+ cache_load(0);
+ list_for_each_entry(pr, &devices, list) {
+ struct mount *m = find_block(pr->uuid, pr->label, NULL, NULL);
+
+ if (m && m->autofs)
+ mount_device(pr, TYPE_HOTPLUG);
+ else
+ blockd_notify(pr->dev, m, pr);
+ }
+ return 0;
+ }
+ return mount_action(argv[2], argv[3], TYPE_AUTOFS);
}
static int find_block_mtd(char *name, char *part, int plen)
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, "f2fs", 4) &&
+ strncmp(pr->type, "btrfs", 5) &&
+ strncmp(pr->type, "ubifs", 5)) {
+ ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs, btrfs or ubifs\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, m->flags,
+ 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, errno, strerror(errno));
} 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;
cache_load(1);
list_for_each_entry(pr, &devices, list)
- mount_device(pr, 0);
+ mount_device(pr, TYPE_DEV);
handle_swapfiles(true);
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], "hotplug"))
return main_hotplug(argc, argv);
+ if (!strcmp(argv[1], "autofs"))
+ return main_autofs(argc, argv);
+
if (!strcmp(argv[1], "extroot"))
return main_extroot(argc, argv);
projects / project / fstools.git / blobdiff