#include <syslog.h>
#include <libgen.h>
#include <glob.h>
+#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/ulog.h>
#include <libubox/list.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"
#endif
-#define ERROR(fmt, ...) do { \
- syslog(LOG_ERR, fmt, ## __VA_ARGS__); \
- fprintf(stderr, "block: "fmt, ## __VA_ARGS__); \
- } while (0)
-
enum {
TYPE_MOUNT,
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 = {
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;
if (m->target && !strcmp(m->target, "/overlay"))
m->extroot = m->overlay = 1;
+ if (m->target && *m->target != '/') {
+ ULOG_WARN("ignoring mount section %s due to invalid target '%s'\n",
+ s->e.name, m->target);
+ free(m);
+ return -1;
+ }
+
if (m->uuid)
vlist_add(&mounts, &m->node, m->uuid);
else if (m->label)
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 int config_load(char *cfg)
+static struct uci_package * config_try_load(struct uci_context *ctx, char *path)
{
- struct uci_context *ctx;
+ char *file = basename(path);
+ char *dir = dirname(path);
+ char *err;
struct uci_package *pkg;
- struct uci_element *e;
- vlist_init(&mounts, avl_strcmp, mounts_update);
+ uci_set_confdir(ctx, dir);
+ ULOG_INFO("attempting to load %s/%s\n", dir, file);
- ctx = uci_alloc_context();
- if (cfg) {
- char path[32];
- snprintf(path, 32, "%s/etc/config", cfg);
- uci_set_confdir(ctx, path);
+ if (uci_load(ctx, file, &pkg)) {
+ uci_get_errorstr(ctx, &err, file);
+ ULOG_ERR("unable to load configuration (%s)\n", err);
+
+ free(err);
+ return NULL;
}
- if (uci_load(ctx, "fstab", &pkg)) {
- uci_set_confdir(ctx, "/etc/config");
- if (uci_load(ctx, "fstab", &pkg)) {
- char *err;
- uci_get_errorstr(ctx, &err, "fstab");
- ERROR("extroot: failed to load %s/etc/config/%s\n",
- cfg ? cfg : "", err);
- free(err);
- return -1;
+ return pkg;
+}
+
+static int config_load(char *cfg)
+{
+ struct uci_context *ctx = uci_alloc_context();
+ struct uci_package *pkg = NULL;
+ struct uci_element *e;
+ char path[64];
+
+ if (cfg) {
+ snprintf(path, sizeof(path), "%s/upper/etc/config/fstab", cfg);
+ pkg = config_try_load(ctx, path);
+
+ if (!pkg) {
+ snprintf(path, sizeof(path), "%s/etc/config/fstab", cfg);
+ pkg = config_try_load(ctx, path);
}
}
+ if (!pkg) {
+ snprintf(path, sizeof(path), "/etc/config/fstab");
+ pkg = config_try_load(ctx, path);
+ }
+
+ if (!pkg) {
+ ULOG_ERR("no usable configuration\n");
+ return -1;
+ }
+
vlist_update(&mounts);
uci_foreach_element(&pkg->sections, e) {
struct uci_section *s = uci_to_section(e);
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;
-
- memset(pr, 0, sizeof(*pr));
- probe_block(path, pr);
-
- if (pr->err || !pr->id) {
- free(pr);
- return NULL;
+ 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);
+ vlist_for_each_element(&devices, dev, node)
+ if (!strcasecmp(dev->pr->dev, tmppath))
+ return NULL;
}
- return pr;
+ return probe_path(path);
}
static int _cache_load(const char *path)
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 blkid_struct_probe *pr = _probe_path(gl.gl_pathv[j]);
- if (pr)
- list_add_tail(&pr->list, &devices);
+ struct probe_info *pr = _probe_path(gl.gl_pathv[j]);
+ 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/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/nvme*");
_cache_load("/dev/vd*");
+ _cache_load("/dev/xvd*");
_cache_load("/dev/mapper/*");
+ vlist_flush(&devices);
}
-static int print_block_info(struct blkid_struct_probe *pr)
+
+static struct device* find_block_device(char *uuid, char *label, char *path)
{
- printf("%s:", pr->dev);
- if (pr->uuid[0])
- printf(" UUID=\"%s\"", pr->uuid);
+ struct device *dev;
- if (pr->label[0])
- printf(" LABEL=\"%s\"", pr->label);
+ if (uuid)
+ vlist_for_each_element(&devices, dev, node)
+ if (dev->pr->uuid && !strcasecmp(dev->pr->uuid, uuid))
+ return dev;
- if (pr->name[0])
- printf(" NAME=\"%s\"", pr->name);
+ if (label)
+ vlist_for_each_element(&devices, dev, node)
+ if (dev->pr->label && !strcmp(dev->pr->label, label))
+ return dev;
- if (pr->version[0])
- printf(" VERSION=\"%s\"", pr->version);
+ if (path)
+ vlist_for_each_element(&devices, dev, node)
+ if (dev->pr->dev && !strcmp(basename(dev->pr->dev), basename(path)))
+ return dev;
- printf(" TYPE=\"%s\"\n", pr->id->name);
+ return NULL;
+}
- return 0;
+static char* find_mount_point(char *block)
+{
+ FILE *fp = fopen("/proc/self/mountinfo", "r");
+ static char line[256];
+ char *point = NULL, *pos, *tmp, *cpoint, *devname;
+ struct stat s;
+ int rstat;
+ unsigned int minor, major;
+
+ if (!fp)
+ return NULL;
+
+ rstat = stat(block, &s);
+
+ while (fgets(line, sizeof(line), fp)) {
+ pos = strchr(line, ' ');
+ if (!pos)
+ continue;
+
+ 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 (!strcmp(block, devname)) {
+ 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;
+ }
+ }
+
+ fclose(fp);
+
+ return point;
}
-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 {
+ char *mp = find_mount_point(pr->dev);
+
printf("config 'mount'\n");
- printf("\toption\ttarget\t'/mnt/%s'\n", basename(pr->dev));
+ 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[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 int print_block_info(struct probe_info *pr)
{
- struct blkid_struct_probe *pr = NULL;
-
- if (uuid)
- list_for_each_entry(pr, &devices, list)
- if (!strcasecmp(pr->uuid, uuid))
- return pr;
-
- if (label)
- list_for_each_entry(pr, &devices, list)
- if (!strcmp(pr->label, label))
- return pr;
-
- if (path)
- list_for_each_entry(pr, &devices, list)
- if (!strcmp(basename(pr->dev), basename(path)))
- return pr;
+ static char *mp;
- return NULL;
-}
-
-static char* find_mount_point(char *block)
-{
- FILE *fp = fopen("/proc/mounts", "r");
- static char line[256];
- int len = strlen(block);
- char *point = NULL;
+ mp = find_mount_point(pr->dev);
+ printf("%s:", pr->dev);
+ if (pr->uuid)
+ printf(" UUID=\"%s\"", pr->uuid);
- if(!fp)
- return NULL;
+ if (pr->label)
+ printf(" LABEL=\"%s\"", pr->label);
- while (fgets(line, sizeof(line), fp)) {
- if (!strncmp(line, block, len)) {
- char *p = &line[len + 1];
- char *t = strstr(p, " ");
+ if (pr->version)
+ printf(" VERSION=\"%s\"", pr->version);
- if (!t) {
- fclose(fp);
- return NULL;
- }
- *t = '\0';
- point = p;
- break;
- }
+ if (mp) {
+ printf(" MOUNT=\"%s\"", mp);
+ free(mp);
}
- fclose(fp);
+ printf(" TYPE=\"%s\"\n", pr->type);
- return point;
+ return 0;
}
static void mkdir_p(char *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 *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 */
- if (!strncmp(pr->id->name, "ubifs", 5))
+ if (!strncmp(pr->type, "ubifs", 5))
return;
- if (strncmp(pr->id->name, "ext", 3)) {
- ERROR("check_filesystem: %s is not supported\n", pr->id->name);
+ if (!strncmp(pr->type, "vfat", 4)) {
+ 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;
}
- if (stat(e2fsck, &statbuf) < 0) {
- ERROR("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(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))
- ERROR("check_filesystem: %s returned %d\n", e2fsck, 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)));
}
}
{
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 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)
+{
+ 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 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->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)
+ m = dev->m;
+ if (m && m->extroot)
return -1;
- if (find_mount_point(pr->dev)) {
- ERROR("%s is already mounted\n", pr->dev);
- return -1;
+ mp = find_mount_point(pr->dev);
+ if (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 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 = mount(pr->dev, target, pr->id->name, m->flags,
- (m->options) ? (m->options) : (""));
- if (err)
- ERROR("mounting %s (%s) as %s failed (%d) - %s\n",
- pr->dev, pr->id->name, target, err, strerror(err));
- 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[] = "/mnt/mmcblk123";
- 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 = mount(pr->dev, target, pr->id->name, 0, "");
- if (err)
- ERROR("mounting %s (%s) as %s failed (%d) - %s\n",
- pr->dev, pr->id->name, target, err, strerror(err));
- 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 blkid_struct_probe *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->id->name, "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)
- ERROR("unmounting %s (%s) failed (%d) - %s\n",
- pr->dev, mp, err, strerror(err));
- else
- ERROR("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)
- ERROR("umount of %s failed (%d) - %s\n",
- mount_point, err, strerror(err));
+ the_dev = find_block_device(NULL, NULL, device);
+ 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")) {
- ERROR("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)
return err;
}
+
+#else
+
+static int find_root_dev(char *buf, int len)
+{
+ DIR *d;
+ dev_t root;
+ struct stat s;
+ struct dirent *e;
+
+ if (stat("/", &s))
+ return -1;
+
+ if (!(d = opendir("/dev")))
+ return -1;
+
+ root = s.st_dev;
+
+ while ((e = readdir(d)) != NULL) {
+ snprintf(buf, len, "/dev/%s", e->d_name);
+
+ if (stat(buf, &s) || s.st_rdev != root)
+ continue;
+
+ closedir(d);
+ return 0;
+ }
+
+ closedir(d);
+ return -1;
+}
+
#endif
+static int test_fs_support(const char *name)
+{
+ char line[128], *p;
+ int rv = -1;
+ FILE *f;
+
+ if ((f = fopen("/proc/filesystems", "r")) != NULL) {
+ while (fgets(line, sizeof(line), f)) {
+ p = strtok(line, "\t\n");
+
+ if (p && !strcmp(p, "nodev"))
+ p = strtok(NULL, "\t\n");
+
+ if (p && !strcmp(p, name)) {
+ rv = 0;
+ break;
+ }
+ }
+ fclose(f);
+ }
+
+ return rv;
+}
+
static int check_extroot(char *path)
{
- struct blkid_struct_probe *pr = NULL;
- char fs[32];
+ struct device *dev;
+ struct probe_info *pr;
+ char devpath[32];
#ifdef UBIFS_EXTROOT
- if (find_block_mtd("rootfs", fs, sizeof(fs))) {
+ if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
int err = -1;
libubi_t libubi;
libubi = libubi_open();
- err = find_block_ubi_RO(libubi, "rootfs", fs, sizeof(fs));
+ err = find_block_ubi_RO(libubi, "rootfs", devpath, sizeof(devpath));
libubi_close(libubi);
if (err)
return -1;
}
#else
- if (find_block_mtd("rootfs", fs, sizeof(fs)))
- return -1;
+ if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
+ if (find_root_dev(devpath, sizeof(devpath))) {
+ ULOG_ERR("extroot: unable to determine root device\n");
+ return -1;
+ }
+ }
#endif
- list_for_each_entry(pr, &devices, list) {
- if (!strcmp(pr->dev, fs)) {
+ vlist_for_each_element(&devices, dev, node) {
+ pr = dev->pr;
+ if (!strcmp(pr->dev, devpath)) {
struct stat s;
FILE *fp = NULL;
char tag[64];
if (stat(tag, &s)) {
fp = fopen(tag, "w+");
if (!fp) {
- ERROR("extroot: failed to write uuid tag file\n");
+ 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) {
- ERROR("extroot: failed to open uuid tag file\n");
+ ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
+ tag, errno);
return -1;
}
- fgets(uuid, sizeof(uuid), fp);
+ if (!fgets(uuid, sizeof(uuid), fp))
+ ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
+ tag, errno);
fclose(fp);
- if (!strcasecmp(uuid, pr->uuid))
+
+ if (*uuid && !strcasecmp(uuid, pr->uuid))
return 0;
- ERROR("extroot: uuid tag does not match rom uuid\n");
+
+ ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n",
+ pr->uuid, basename(path), uuid);
+ return -1;
}
}
+
+ ULOG_ERR("extroot: unable to lookup root device %s\n", devpath);
return -1;
}
char overlay[] = "/tmp/extroot/overlay";
char mnt[] = "/tmp/extroot/mnt";
char *path = mnt;
- struct blkid_struct_probe *pr;
+ struct device *dev;
+ struct probe_info *pr;
struct mount *m;
int err = -1;
if (!m || !m->extroot)
{
- ERROR("extroot: no root or overlay mount defined\n");
+ ULOG_INFO("extroot: not configured\n");
return -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){
- ERROR("extroot: is not ready yet, retrying in %u seconds\n", delay_root);
+ if (!dev && delay_root){
+ ULOG_INFO("extroot: device not present, retrying in %u seconds\n", delay_root);
sleep(delay_root);
- mkblkdev();
- cache_load(0);
- pr = find_block_info(m->uuid, m->label, m->device);
+ make_devs();
+ cache_load(1);
+ dev = find_block_device(m->uuid, m->label, m->device);
}
- if (pr) {
- if (strncmp(pr->id->name, "ext", 3) &&
- strncmp(pr->id->name, "ubifs", 5)) {
- ERROR("extroot: %s is not supported, try ext4\n", pr->id->name);
+ 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, f2fs, btrfs, ntfs or ubifs\n", pr->type);
+ return -1;
+ }
+
+ if (test_fs_support(pr->type)) {
+ ULOG_ERR("extroot: filesystem %s not supported by kernel\n", pr->type);
return -1;
}
+
if (m->overlay)
path = overlay;
mkdir_p(path);
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) {
- ERROR("mounting %s (%s) as %s failed (%d) - %s\n",
- pr->dev, pr->id->name, path, err, strerror(err));
+ 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)
umount(path);
}
} else {
- ERROR("extroot: cannot find block device\n");
+ ULOG_ERR("extroot: cannot find device %s%s\n",
+ (m->uuid ? "with UUID " : (m->label ? "with label " : "")),
+ (m->uuid ? m->uuid : (m->label ? m->label : m->device)));
}
return err;
static int main_extroot(int argc, char **argv)
{
- struct blkid_struct_probe *pr;
char blkdev_path[32] = { 0 };
int err = -1;
#ifdef UBIFS_EXTROOT
return -1;
if (argc != 2) {
- fprintf(stderr, "Usage: block extroot mountpoint\n");
+ ULOG_ERR("Usage: block extroot\n");
return -1;
}
- mkblkdev();
+ make_devs();
cache_load(1);
+ /* enable LOG_INFO messages */
+ ulog_threshold(LOG_INFO);
+
/*
* Look for "rootfs_data". We will want to mount it and check for
* extroot configuration.
*/
/* Start with looking for MTD partition */
- find_block_mtd("rootfs_data", blkdev_path, sizeof(blkdev_path));
+ 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")) {
+ 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 blkid_struct_probe *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 blkid_struct_probe *pr;
+ 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 blkid_struct_probe *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 blkid_struct_probe *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;
};
struct stat s;
if (stat(argv[i], &s)) {
- ERROR("failed to stat %s\n", argv[i]);
+ ULOG_ERR("failed to stat %s\n", argv[i]);
continue;
}
- if (!S_ISBLK(s.st_mode)) {
- ERROR("%s is not a block device\n", argv[i]);
+ 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;
}
- 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 blkid_struct_probe *pr;
+ struct device *dev;
+ struct probe_info *pr;
int flags = 0;
int pri;
struct stat st;
lineptr = NULL;
if (!fp) {
- ERROR("failed to open /proc/swaps\n");
+ ULOG_ERR("failed to open /proc/swaps\n");
return -1;
}
while (getline(&lineptr, &s, fp) > 0)
- printf(lineptr);
+ printf("%s", lineptr);
if (lineptr)
free(lineptr);
fclose(fp);
return 0;
case 'a':
cache_load(0);
- list_for_each_entry(pr, &devices, list) {
- if (strcmp(pr->id->name, "swap"))
+ vlist_for_each_element(&devices, dev, node) {
+ pr = dev->pr;
+ if (strcmp(pr->type, "swap"))
continue;
if (swapon(pr->dev, 0))
- ERROR("failed to swapon %s\n", pr->dev);
+ ULOG_ERR("failed to swapon %s\n", pr->dev);
}
return 0;
case 'p':
default:
return swapon_usage();
}
-
}
if (optind != (argc - 1))
return swapon_usage();
if (stat(argv[optind], &st) || (!S_ISBLK(st.st_mode) && !S_ISREG(st.st_mode))) {
- ERROR("%s is not a block device or file\n", argv[optind]);
+ ULOG_ERR("%s is not a block device or file\n", argv[optind]);
return -1;
}
err = swapon(argv[optind], flags);
if (err) {
- ERROR("failed to swapon %s (%d)\n", argv[optind], err);
+ ULOG_ERR("failed to swapon %s (%d)\n", argv[optind], err);
return err;
}
static int main_swapoff(int argc, char **argv)
{
if (argc != 2) {
- ERROR("Usage: swapoff [-a] [DEVICE]\n\n"
+ ULOG_ERR("Usage: swapoff [-a] [DEVICE]\n\n"
"\tStop swapping on DEVICE\n"
" -a\tStop swapping on all swap devices\n");
return -1;
char line[256];
if (!fp) {
- ERROR("failed to open /proc/swaps\n");
+ ULOG_ERR("failed to open /proc/swaps\n");
return -1;
}
- fgets(line, sizeof(line), fp);
- while (fgets(line, sizeof(line), fp)) {
- char *end = strchr(line, ' ');
- int err;
+ if (fgets(line, sizeof(line), fp))
+ while (fgets(line, sizeof(line), fp)) {
+ char *end = strchr(line, ' ');
+ int err;
- if (!end)
- continue;
- *end = '\0';
- err = swapoff(line);
- if (err)
- ERROR("failed to swapoff %s (%d)\n", line, err);
- }
+ if (!end)
+ continue;
+ *end = '\0';
+ err = swapoff(line);
+ if (err)
+ ULOG_ERR("failed to swapoff %s (%d)\n", line, err);
+ }
fclose(fp);
} else {
struct stat s;
int err;
if (stat(argv[1], &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode))) {
- ERROR("%s is not a block device or file\n", argv[1]);
+ ULOG_ERR("%s is not a block device or file\n", argv[1]);
return -1;
}
err = swapoff(argv[1]);
if (err) {
- ERROR("fsiled to swapoff %s (%d)\n", argv[1], err);
+ ULOG_ERR("failed to swapoff %s (%d)\n", argv[1], err);
return err;
}
}
umask(0);
+ ulog_open(-1, -1, "block");
+ ulog_threshold(LOG_NOTICE);
+
if (!strcmp(base, "swapon"))
return main_swapon(argc, argv);
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);
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;
+ }
}
- fprintf(stderr, "Usage: block <info|mount|umount|detect>\n");
+ ULOG_ERR("Usage: block <info|mount|umount|detect>\n");
return -1;
}
projects / project / fstools.git / blobdiff