#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 <libubox/vlist.h>
#include <libubox/blobmsg_json.h>
#include <libubox/avl-cmp.h>
+#include <libubus.h>
#include "probe.h"
+#define AUTOFS_MOUNT_PATH "/tmp/run/blockd/"
+
#ifdef UBIFS_EXTROOT
#include "libubi/libubi.h"
#endif
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 = {
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;
pid_t pid;
struct stat statbuf;
const char *e2fsck = "/usr/sbin/e2fsck";
+ const char *f2fsck = "/usr/sbin/fsck.f2fs";
const char *dosfsck = "/usr/sbin/dosfsck";
const char *ckfs;
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 {
pid = fork();
if (!pid) {
- execl(ckfs, ckfs, "-p", pr->dev, NULL);
- exit(-1);
+ if(!strncmp(pr->type, "f2fs", 4)) {
+ execl(ckfs, ckfs, "-f", pr->dev, NULL);
+ exit(-1);
+ } else {
+ execl(ckfs, ckfs, "-p", pr->dev, NULL);
+ exit(-1);
+ }
} else if (pid > 0) {
int status;
}
}
-static int mount_device(struct probe_info *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;
device = basename(pr->dev);
if (!strcmp(pr->type, "swap")) {
- if (hotplug && !auto_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;
-
mp = find_mount_point(pr->dev);
- if (mp) {
+ 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->type, 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->type, target, errno, strerror(errno));
if (check_fs)
check_filesystem(pr);
- err = mount(pr->dev, target, pr->type, 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->type, target, errno, strerror(errno));
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);
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)
}
if (pr) {
if (strncmp(pr->type, "ext", 3) &&
+ strncmp(pr->type, "f2fs", 4) &&
strncmp(pr->type, "ubifs", 5)) {
- ULOG_ERR("extroot: unsupported filesystem %s, try ext4\n", pr->type);
+ ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs or ubifs\n", pr->type);
return -1;
}
cache_load(1);
list_for_each_entry(pr, &devices, list)
- mount_device(pr, 0);
+ mount_device(pr, TYPE_DEV);
handle_swapfiles(true);
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