#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;
};
-static struct vlist_tree mounts;
+struct device {
+ struct vlist_node node;
+
+ struct probe_info *pr;
+ struct mount *m;
+};
+
+static void vlist_nop_update(struct vlist_tree *tree, struct vlist_node *node_new,
+ struct vlist_node *node_old);
+static int devices_cmp(const void *k1, const void *k2, void *ptr);
+
static struct blob_buf b;
-static LIST_HEAD(devices);
+static VLIST_TREE(mounts, avl_strcmp, vlist_nop_update, false, false);
+static VLIST_TREE(devices, devices_cmp, vlist_nop_update, false, false);
static int anon_mount, anon_swap, auto_mount, auto_swap, check_fs;
static unsigned int delay_root;
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;
return NULL;
}
-static void mounts_update(struct vlist_tree *tree, struct vlist_node *node_new,
+static void vlist_nop_update(struct vlist_tree *tree, struct vlist_node *node_new,
struct vlist_node *node_old)
{
+ // NOTE: free on delete skipped
}
static struct uci_package * config_try_load(struct uci_context *ctx, char *path)
struct uci_element *e;
char path[64];
- vlist_init(&mounts, avl_strcmp, mounts_update);
-
if (cfg) {
snprintf(path, sizeof(path), "%s/upper/etc/config/fstab", cfg);
pkg = config_try_load(ctx, path);
static struct probe_info* _probe_path(char *path)
{
- struct probe_info *pr;
+ struct device *dev;
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))
+ vlist_for_each_element(&devices, dev, node)
+ if (!strcasecmp(dev->pr->dev, tmppath))
return NULL;
}
int gl_flags = GLOB_NOESCAPE | GLOB_MARK;
int j;
glob_t gl;
+ struct device *dev;
if (glob(path, gl_flags, NULL, &gl) < 0)
return -1;
for (j = 0; j < gl.gl_pathc; j++) {
struct probe_info *pr = _probe_path(gl.gl_pathv[j]);
- if (pr)
- list_add_tail(&pr->list, &devices);
+ if (pr) {
+ dev = malloc(sizeof(struct device));
+ dev->pr = pr;
+ dev->m = find_block(pr->uuid, pr->label,
+ basename(pr->dev), NULL);
+ vlist_add(&devices, &dev->node, dev);
+ }
}
globfree(&gl);
return 0;
}
+static int devices_cmp(const void *k1, const void *k2, void *ptr)
+{
+ struct device *dev1 = (struct device *)k1;
+ struct device *dev2 = (struct device *)k2;
+
+ if (dev1->m) {
+ if (!dev2->m)
+ return -1;
+ if (dev1->m->type == TYPE_MOUNT && dev2->m->type == TYPE_MOUNT &&
+ dev1->m->target && dev2->m->target) {
+ int len1 = strlen(dev1->m->target);
+ int len2 = strlen(dev2->m->target);
+ if (len1 != len2)
+ return len1 - len2;
+ }
+ } else if (dev2->m) {
+ return 1;
+ }
+ return strcmp(dev1->pr->dev, dev2->pr->dev);
+}
+
static void cache_load(int mtd)
{
+ vlist_update(&devices);
if (mtd) {
_cache_load("/dev/mtdblock*");
_cache_load("/dev/ubiblock*");
_cache_load("/dev/sd*");
_cache_load("/dev/hd*");
_cache_load("/dev/md*");
+ _cache_load("/dev/nvme*");
_cache_load("/dev/vd*");
+ _cache_load("/dev/xvd*");
_cache_load("/dev/mapper/*");
+ vlist_flush(&devices);
}
-static int print_block_uci(struct probe_info *pr)
+static struct device* find_block_device(char *uuid, char *label, char *path)
{
- 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)
- printf("\toption\tuuid\t'%s'\n", pr->uuid);
- else
- printf("\toption\tdevice\t'%s'\n", pr->dev);
- printf("\toption\tenabled\t'0'\n\n");
-
- return 0;
-}
-
-static struct probe_info* find_block_info(char *uuid, char *label, char *path)
-{
- struct probe_info *pr = NULL;
+ struct device *dev;
if (uuid)
- list_for_each_entry(pr, &devices, list)
- if (pr->uuid && !strcasecmp(pr->uuid, uuid))
- return pr;
+ vlist_for_each_element(&devices, dev, node)
+ if (dev->pr->uuid && !strcasecmp(dev->pr->uuid, uuid))
+ return dev;
if (label)
- list_for_each_entry(pr, &devices, list)
- if (pr->label && !strcmp(pr->label, label))
- return pr;
+ vlist_for_each_element(&devices, dev, node)
+ if (dev->pr->label && !strcmp(dev->pr->label, label))
+ return dev;
if (path)
- list_for_each_entry(pr, &devices, list)
- if (pr->dev && !strcmp(basename(pr->dev), basename(path)))
- return pr;
+ vlist_for_each_element(&devices, dev, node)
+ if (dev->pr->dev && !strcmp(basename(dev->pr->dev), basename(path)))
+ return dev;
return NULL;
}
{
FILE *fp = fopen("/proc/self/mountinfo", "r");
static char line[256];
- int len = strlen(block);
char *point = NULL, *pos, *tmp, *cpoint, *devname;
struct stat s;
int rstat;
*pos = '\0';
devname = tmp;
- if (!strncmp(block, devname, len)) {
+ if (!strcmp(block, devname)) {
point = strdup(cpoint);
break;
}
return point;
}
+static int print_block_uci(struct probe_info *pr)
+{
+ if (!strcmp(pr->type, "swap")) {
+ printf("config 'swap'\n");
+ } else {
+ char *mp = find_mount_point(pr->dev);
+
+ printf("config 'mount'\n");
+ if (mp) {
+ printf("\toption\ttarget\t'%s'\n", mp);
+ free(mp);
+ } else {
+ printf("\toption\ttarget\t'/mnt/%s'\n", basename(pr->dev));
+ }
+ }
+ if (pr->uuid)
+ printf("\toption\tuuid\t'%s'\n", pr->uuid);
+ else
+ printf("\toption\tdevice\t'%s'\n", pr->dev);
+ printf("\toption\tenabled\t'0'\n\n");
+
+ return 0;
+}
+
static int print_block_info(struct probe_info *pr)
{
static char *mp;
pid_t pid;
struct stat statbuf;
const char *e2fsck = "/usr/sbin/e2fsck";
- const char *dosfsck = "/usr/sbin/dosfsck";
+ const char *f2fsck = "/usr/sbin/fsck.f2fs";
+ const char *fatfsck = "/usr/sbin/fsck.fat";
+ const char *btrfsck = "/usr/bin/btrfsck";
+ const char *ntfsck = "/usr/bin/ntfsfix";
const char *ckfs;
/* UBIFS does not need stuff like fsck */
return;
if (!strncmp(pr->type, "vfat", 4)) {
- ckfs = dosfsck;
+ ckfs = fatfsck;
+ } 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 if (!strncmp(pr->type, "ntfs", 4)) {
+ ckfs = ntfsck;
} else {
ULOG_ERR("check_filesystem: %s is not supported\n", pr->type);
return;
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(EXIT_FAILURE);
+ } else if(!strncmp(pr->type, "btrfs", 5)) {
+ execl(ckfs, ckfs, "--repair", pr->dev, NULL);
+ exit(EXIT_FAILURE);
+ } else if(!strncmp(pr->type, "ntfs", 4)) {
+ execl(ckfs, ckfs, "-b", pr->dev, NULL);
+ exit(EXIT_FAILURE);
+ } else {
+ execl(ckfs, ckfs, "-p", pr->dev, NULL);
+ exit(EXIT_FAILURE);
+ }
} else if (pid > 0) {
int status;
waitpid(pid, &status, 0);
- if (WEXITSTATUS(status))
+ if (WIFEXITED(status) && WEXITSTATUS(status))
ULOG_ERR("check_filesystem: %s returned %d\n", ckfs, WEXITSTATUS(status));
+ if (WIFSIGNALED(status))
+ ULOG_ERR("check_filesystem: %s terminated by %s\n", ckfs, strsignal(WTERMSIG(status)));
}
}
return err;
}
+static int hotplug_call_mount(const char *action, const char *device)
+{
+ pid_t pid;
+ int err = 0;
+
+ pid = fork();
+ if (!pid) {
+ char * const argv[] = { "hotplug-call", "mount", NULL };
+
+ setenv("ACTION", action, 1);
+ setenv("DEVICE", device, 1);
+
+ execv("/sbin/hotplug-call", argv);
+ exit(-1);
+ } else if (pid > 0) {
+ int status;
+
+ pid = waitpid(pid, &status, 0);
+ if (pid <= 0 || !WIFEXITED(status) || WEXITSTATUS(status)) {
+ err = -ENOEXEC;
+ ULOG_ERR("hotplug-call call failed\n");
+ }
+ } else {
+ err = -errno;
+ }
+
+ return err;
+}
+
static int handle_mount(const char *source, const char *target,
const char *fstype, struct mount *m)
{
return err;
}
-static int mount_device(struct probe_info *pr, int hotplug)
+static int blockd_notify(char *device, struct mount *m, struct probe_info *pr)
+{
+ struct ubus_context *ctx = ubus_connect(NULL);
+ uint32_t id;
+ int err;
+
+ if (!ctx)
+ return -ENXIO;
+
+ 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);
+ }
+
+ err = ubus_invoke(ctx, id, "hotplug", buf.head, NULL, NULL, 3000);
+ } else {
+ err = -ENOENT;
+ }
+
+ ubus_free(ctx);
+
+ return err;
+}
+
+static int mount_device(struct device *dev, int type)
{
struct mount *m;
+ struct probe_info *pr;
+ struct stat st;
+ char _target[32];
+ char *target;
char *device;
char *mp;
+ int err;
- if (!pr)
+ if (!dev)
return -1;
+ pr = dev->pr;
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)
+ m = dev->m;
+ if (m && m->extroot)
return -1;
mp = find_mount_point(pr->dev);
if (mp) {
- ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
+ if (m && m->type == TYPE_MOUNT && strcmp(m->target, mp)) {
+ ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
+ err = -1;
+ } else
+ err = 0;
free(mp);
- return -1;
+ return err;
}
- m = find_block(pr->uuid, pr->label, device, NULL);
- if (m && m->extroot)
- return -1;
+ if (type == TYPE_HOTPLUG)
+ blockd_notify(device, m, pr);
+ /* Check if device should be mounted & set the target directory */
if (m) {
- char *target = m->target;
- char _target[32];
- int err = 0;
+ switch (type) {
+ case TYPE_HOTPLUG:
+ 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;
+ }
- if (!target) {
+ if (m->autofs) {
+ snprintf(_target, sizeof(_target), "/tmp/run/blockd/%s", device);
+ target = _target;
+ } else if (m->target) {
+ target = m->target;
+ } else {
snprintf(_target, sizeof(_target), "/mnt/%s", device);
target = _target;
}
- mkdir_p(target);
-
- if (check_fs)
- check_filesystem(pr);
-
- 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));
- else
- handle_swapfiles(true);
- return err;
+ } else if (anon_mount) {
+ snprintf(_target, sizeof(_target), "/mnt/%s", device);
+ target = _target;
+ } else {
+ /* No reason to mount this device */
+ return 0;
}
- if (anon_mount) {
- char target[32];
- int err = 0;
+ /* Mount the device */
- snprintf(target, sizeof(target), "/mnt/%s", device);
- mkdir_p(target);
+ if (check_fs)
+ check_filesystem(pr);
- if (check_fs)
- check_filesystem(pr);
+ mkdir_p(target);
+ if (!lstat(target, &st) && S_ISLNK(st.st_mode))
+ unlink(target);
- 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));
- else
- handle_swapfiles(true);
+ err = handle_mount(pr->dev, target, pr->type, m);
+ if (err) {
+ ULOG_ERR("mounting %s (%s) as %s failed (%d) - %m\n",
+ pr->dev, pr->type, target, errno);
return err;
}
+ handle_swapfiles(true);
+
+ if (type != TYPE_AUTOFS)
+ hotplug_call_mount("add", device);
+
return 0;
}
-static int umount_device(struct probe_info *pr)
+static int umount_device(char *path, int type, bool all)
{
- struct mount *m;
- char *device = basename(pr->dev);
char *mp;
int err;
- if (!pr)
- return -1;
-
- if (!strcmp(pr->type, "swap"))
- return -1;
-
- mp = find_mount_point(pr->dev);
+ mp = find_mount_point(path);
if (!mp)
return -1;
+ if (!strcmp(mp, "/") && !all)
+ return 0;
- m = find_block(pr->uuid, pr->label, device, NULL);
- if (m && m->extroot)
- return -1;
+ if (type != TYPE_AUTOFS)
+ hotplug_call_mount("remove", basename(path));
err = umount2(mp, MNT_DETACH);
- if (err)
- ULOG_ERR("unmounting %s (%s) failed (%d) - %s\n",
- pr->dev, mp, errno, strerror(errno));
- else
- ULOG_INFO("unmounted %s (%s)\n",
- pr->dev, mp);
+ if (err) {
+ ULOG_ERR("unmounting %s (%s) failed (%d) - %m\n", path, mp,
+ errno);
+ } else {
+ ULOG_INFO("unmounted %s (%s)\n", path, mp);
+ rmdir(mp);
+ }
free(mp);
return err;
}
-static int main_hotplug(int argc, char **argv)
+static int mount_action(char *action, char *device, int type)
{
+ struct device *the_dev, *dev;
char path[32];
- char *action, *device, *mount_point;
-
- action = getenv("ACTION");
- device = getenv("DEVNAME");
if (!action || !device)
return -1;
- snprintf(path, sizeof(path), "/dev/%s", device);
- if (!strcmp(action, "remove")) {
- int err = 0;
- mount_point = find_mount_point(path);
- if (mount_point)
- err = umount2(mount_point, MNT_DETACH);
+ if (config_load(NULL))
+ return -1;
+ cache_load(0);
- if (err)
- ULOG_ERR("umount of %s failed (%d) - %s\n",
- mount_point, errno, strerror(errno));
+ the_dev = find_block_device(NULL, NULL, device);
- free(mount_point);
+ if (!strcmp(action, "remove")) {
+ if (type == TYPE_HOTPLUG)
+ blockd_notify(device, NULL, NULL);
+
+ if (!the_dev || !the_dev->m || the_dev->m->type != TYPE_MOUNT) {
+ snprintf(path, sizeof(path), "/dev/%s", device);
+ umount_device(path, type, true);
+ } else
+ vlist_for_element_to_last_reverse(&devices, the_dev, dev, node)
+ if (dev->m && dev->m->type == TYPE_MOUNT)
+ umount_device(dev->pr->dev, type, true);
return 0;
- } else if (strcmp(action, "add")) {
- ULOG_ERR("Unkown action %s\n", action);
+ } else if (!strcmp(action, "add")) {
+ if (!the_dev)
+ return -1;
+ if (the_dev->m && the_dev->m->type == TYPE_MOUNT) {
+ vlist_for_first_to_element(&devices, the_dev, dev, node) {
+ if (dev->m && dev->m->type == TYPE_MOUNT) {
+ int err = mount_device(dev, type);
+ if (err)
+ return err;
+ }
+ }
+ return 0;
+ } else
+ return mount_device(the_dev, type);
+ }
+ ULOG_ERR("Unkown action %s\n", action);
+ return -1;
+}
+
+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)
+{
+ int err = 0;
+
+ if (argc < 3)
return -1;
+
+ if (!strcmp(argv[2], "start")) {
+ struct device *dev;
+ struct probe_info *pr;
+
+ if (config_load(NULL))
+ return -1;
+
+ cache_load(0);
+ vlist_for_each_element(&devices, dev, node) {
+ struct mount *m;
+
+ pr = dev->pr;
+ if (!strcmp(pr->type, "swap"))
+ continue;
+
+ m = dev->m;
+ if (m && m->extroot)
+ continue;
+
+ blockd_notify(pr->dev, m, pr);
+ }
+ } else if (!strcmp(argv[2], "available")) {
+ err = hotplug_call_mount("add", argv[3]);
+ } else if (!strcmp(argv[2], "unavailable")) {
+ err = hotplug_call_mount("remove", argv[3]);
+ } else {
+ if (argc < 4)
+ return -EINVAL;
+
+ err = mount_action(argv[2], argv[3], TYPE_AUTOFS);
}
- if (config_load(NULL))
- return -1;
- cache_load(0);
+ if (err) {
+ ULOG_ERR("autofs: \"%s\" action has failed: %d\n", argv[2], err);
+ }
- return mount_device(find_block_info(NULL, NULL, path), 1);
+ return err;
}
static int find_block_mtd(char *name, char *part, int plen)
static int check_extroot(char *path)
{
- struct probe_info *pr = NULL;
+ struct device *dev;
+ struct probe_info *pr;
char devpath[32];
#ifdef UBIFS_EXTROOT
}
#endif
- list_for_each_entry(pr, &devices, list) {
+ vlist_for_each_element(&devices, dev, node) {
+ pr = dev->pr;
if (!strcmp(pr->dev, devpath)) {
struct stat s;
FILE *fp = NULL;
if (stat(tag, &s)) {
fp = fopen(tag, "w+");
if (!fp) {
- ULOG_ERR("extroot: failed to write UUID to %s: %d (%s)\n",
- tag, errno, strerror(errno));
+ ULOG_ERR("extroot: failed to write UUID to %s: %d (%m)\n",
+ tag, errno);
/* return 0 to continue boot regardless of error */
return 0;
}
fp = fopen(tag, "r");
if (!fp) {
- ULOG_ERR("extroot: failed to read UUID from %s: %d (%s)\n",
- tag, errno, strerror(errno));
+ ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
+ tag, errno);
return -1;
}
if (!fgets(uuid, sizeof(uuid), fp))
- ULOG_ERR("extroot: failed to read UUID from %s: %d (%s)\n",
- tag, errno, strerror(errno));
+ ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
+ tag, errno);
fclose(fp);
if (*uuid && !strcasecmp(uuid, pr->uuid))
char overlay[] = "/tmp/extroot/overlay";
char mnt[] = "/tmp/extroot/mnt";
char *path = mnt;
+ struct device *dev;
struct probe_info *pr;
struct mount *m;
int err = -1;
}
/* Find block device pointed by the mount config */
- pr = find_block_info(m->uuid, m->label, m->device);
+ dev = find_block_device(m->uuid, m->label, m->device);
- if (!pr && delay_root){
+ if (!dev && delay_root){
ULOG_INFO("extroot: device not present, retrying in %u seconds\n", delay_root);
sleep(delay_root);
make_devs();
- cache_load(0);
- pr = find_block_info(m->uuid, m->label, m->device);
+ cache_load(1);
+ dev = find_block_device(m->uuid, m->label, m->device);
}
- if (pr) {
+ if (dev) {
+ pr = dev->pr;
if (strncmp(pr->type, "ext", 3) &&
+ strncmp(pr->type, "f2fs", 4) &&
+ strncmp(pr->type, "btrfs", 5) &&
+ strncmp(pr->type, "ntfs", 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, btrfs, ntfs or ubifs\n", pr->type);
return -1;
}
(m->options) ? (m->options) : (""));
if (err) {
- ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%s)\n",
- pr->dev, pr->type, path, errno, strerror(errno));
+ ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%m)\n",
+ pr->dev, pr->type, path, errno);
} else if (m->overlay) {
err = check_extroot(path);
if (err)
static int main_extroot(int argc, char **argv)
{
- struct probe_info *pr;
char blkdev_path[32] = { 0 };
int err = -1;
#ifdef UBIFS_EXTROOT
/* Start with looking for MTD partition */
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->type, "jffs2")) {
+ struct device *dev = find_block_device(NULL, NULL, blkdev_path);
+ if (dev && !strcmp(dev->pr->type, "jffs2")) {
char cfg[] = "/tmp/jffs_cfg";
/*
static int main_mount(int argc, char **argv)
{
- struct probe_info *pr;
+ struct device *dev;
if (config_load(NULL))
return -1;
cache_load(1);
- list_for_each_entry(pr, &devices, list)
- mount_device(pr, 0);
+ vlist_for_each_element(&devices, dev, node)
+ mount_device(dev, TYPE_DEV);
handle_swapfiles(true);
static int main_umount(int argc, char **argv)
{
+ struct device *dev;
struct probe_info *pr;
+ bool all = false;
if (config_load(NULL))
return -1;
handle_swapfiles(false);
cache_load(0);
- list_for_each_entry(pr, &devices, list)
- umount_device(pr);
+
+ if (argc == 3)
+ all = !strcmp(argv[2], "-a");
+
+ vlist_for_each_element_reverse(&devices, dev, node) {
+ struct mount *m;
+
+ pr = dev->pr;
+ if (!strcmp(pr->type, "swap"))
+ continue;
+
+ m = dev->m;
+ if (m && m->extroot)
+ continue;
+
+ umount_device(pr->dev, TYPE_DEV, all);
+ }
return 0;
}
static int main_detect(int argc, char **argv)
{
- struct probe_info *pr;
+ struct device *dev;
cache_load(0);
printf("config 'global'\n");
printf("\toption\tauto_mount\t'1'\n");
printf("\toption\tdelay_root\t'5'\n");
printf("\toption\tcheck_fs\t'0'\n\n");
- list_for_each_entry(pr, &devices, list)
- print_block_uci(pr);
+ vlist_for_each_element(&devices, dev, node)
+ print_block_uci(dev->pr);
return 0;
}
static int main_info(int argc, char **argv)
{
int i;
- struct probe_info *pr;
+ struct device *dev;
cache_load(1);
if (argc == 2) {
- list_for_each_entry(pr, &devices, list)
- print_block_info(pr);
+ vlist_for_each_element(&devices, dev, node)
+ print_block_info(dev->pr);
return 0;
};
ULOG_ERR("%s is not a block device\n", argv[i]);
continue;
}
- pr = find_block_info(NULL, NULL, argv[i]);
- if (pr)
- print_block_info(pr);
+ dev = find_block_device(NULL, NULL, argv[i]);
+ if (dev)
+ print_block_info(dev->pr);
}
return 0;
FILE *fp;
char *lineptr;
size_t s;
+ struct device *dev;
struct probe_info *pr;
int flags = 0;
int pri;
return 0;
case 'a':
cache_load(0);
- list_for_each_entry(pr, &devices, list) {
+ vlist_for_each_element(&devices, dev, node) {
+ pr = dev->pr;
if (strcmp(pr->type, "swap"))
continue;
if (swapon(pr->dev, 0))
default:
return swapon_usage();
}
-
}
if (optind != (argc - 1))
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