* GNU General Public License for more details.
*/
+#define _GNU_SOURCE
+#include <getopt.h>
#include <stdio.h>
#include <unistd.h>
#include <syslog.h>
#include <sys/types.h>
#include <sys/swap.h>
#include <sys/mount.h>
+#include <sys/wait.h>
#include <uci.h>
#include <uci_blob.h>
char *target;
char *path;
char *options;
+ uint32_t flags;
char *uuid;
char *label;
+ char *device;
+ int extroot;
+ int overlay;
int disabled_fsck;
unsigned int prio;
};
static struct vlist_tree mounts;
static struct blob_buf b;
static LIST_HEAD(devices);
+static int anon_mount, anon_swap, auto_mount, auto_swap, check_fs;
+static unsigned int delay_root;
+
+enum {
+ CFG_ANON_MOUNT,
+ CFG_ANON_SWAP,
+ CFG_AUTO_MOUNT,
+ CFG_AUTO_SWAP,
+ CFG_DELAY_ROOT,
+ CFG_CHECK_FS,
+ __CFG_MAX
+};
+
+static const struct blobmsg_policy config_policy[__CFG_MAX] = {
+ [CFG_ANON_SWAP] = { .name = "anon_swap", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_ANON_MOUNT] = { .name = "anon_mount", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_AUTO_SWAP] = { .name = "auto_swap", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_AUTO_MOUNT] = { .name = "auto_mount", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_DELAY_ROOT] = { .name = "delay_root", .type = BLOBMSG_TYPE_INT32 },
+ [CFG_CHECK_FS] = { .name = "check_fs", .type = BLOBMSG_TYPE_INT32 },
+};
enum {
MOUNT_UUID,
MOUNT_LABEL,
MOUNT_ENABLE,
MOUNT_TARGET,
+ MOUNT_DEVICE,
MOUNT_OPTIONS,
__MOUNT_MAX
};
+static const struct uci_blob_param_list config_attr_list = {
+ .n_params = __CFG_MAX,
+ .params = config_policy,
+};
+
static const struct blobmsg_policy mount_policy[__MOUNT_MAX] = {
[MOUNT_UUID] = { .name = "uuid", .type = BLOBMSG_TYPE_STRING },
[MOUNT_LABEL] = { .name = "label", .type = BLOBMSG_TYPE_STRING },
+ [MOUNT_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
[MOUNT_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
[MOUNT_OPTIONS] = { .name = "options", .type = BLOBMSG_TYPE_STRING },
[MOUNT_ENABLE] = { .name = "enabled", .type = BLOBMSG_TYPE_INT32 },
enum {
SWAP_ENABLE,
SWAP_UUID,
+ SWAP_LABEL,
+ SWAP_DEVICE,
SWAP_PRIO,
__SWAP_MAX
};
static const struct blobmsg_policy swap_policy[__SWAP_MAX] = {
[SWAP_ENABLE] = { .name = "enabled", .type = BLOBMSG_TYPE_INT32 },
[SWAP_UUID] = { .name = "uuid", .type = BLOBMSG_TYPE_STRING },
+ [SWAP_LABEL] = { .name = "label", .type = BLOBMSG_TYPE_STRING },
+ [SWAP_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
[SWAP_PRIO] = { .name = "priority", .type = BLOBMSG_TYPE_INT32 },
};
.params = swap_policy,
};
+struct mount_flag {
+ const char *name;
+ 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 },
+ { "dirsync", MS_DIRSYNC },
+ { "mand", MS_MANDLOCK },
+ { "nomand", ~MS_MANDLOCK },
+ { "atime", ~MS_NOATIME },
+ { "noatime", MS_NOATIME },
+ { "dev", ~MS_NODEV },
+ { "nodev", MS_NODEV },
+ { "diratime", ~MS_NODIRATIME },
+ { "nodiratime", MS_NODIRATIME },
+ { "exec", ~MS_NOEXEC },
+ { "noexec", MS_NOEXEC },
+ { "suid", ~MS_NOSUID },
+ { "nosuid", MS_NOSUID },
+ { "rw", ~MS_RDONLY },
+ { "ro", MS_RDONLY },
+ { "relatime", MS_RELATIME },
+ { "norelatime", ~MS_RELATIME },
+ { "strictatime", MS_STRICTATIME },
+};
+
static char *blobmsg_get_strdup(struct blob_attr *attr)
{
if (!attr)
return strdup(blobmsg_get_string(attr));
}
+static char *blobmsg_get_basename(struct blob_attr *attr)
+{
+ if (!attr)
+ return NULL;
+
+ return strdup(basename(blobmsg_get_string(attr)));
+}
+
+static void parse_mount_options(struct mount *m, char *optstr)
+{
+ int i;
+ bool is_flag;
+ char *p, *opts, *last;
+
+ m->flags = 0;
+ m->options = NULL;
+
+ if (!optstr || !*optstr)
+ return;
+
+ m->options = opts = calloc(1, strlen(optstr) + 1);
+
+ if (!m->options)
+ return;
+
+ p = last = optstr;
+
+ do {
+ p = strchr(p, ',');
+
+ if (p)
+ *p++ = 0;
+
+ for (i = 0, is_flag = false; i < ARRAY_SIZE(mount_flags); i++) {
+ if (!strcmp(last, mount_flags[i].name)) {
+ if (mount_flags[i].flag < 0)
+ m->flags &= (uint32_t)mount_flags[i].flag;
+ else
+ m->flags |= (uint32_t)mount_flags[i].flag;
+ is_flag = true;
+ break;
+ }
+ }
+
+ if (!is_flag)
+ opts += sprintf(opts, "%s%s", (opts > m->options) ? "," : "", last);
+
+ last = p;
+
+ } while (p);
+
+ free(optstr);
+}
+
static int mount_add(struct uci_section *s)
{
struct blob_attr *tb[__MOUNT_MAX] = { 0 };
uci_to_blob(&b, s, &mount_attr_list);
blobmsg_parse(mount_policy, __MOUNT_MAX, tb, blob_data(b.head), blob_len(b.head));
- if (!tb[MOUNT_LABEL] && !tb[MOUNT_UUID])
+ if (!tb[MOUNT_LABEL] && !tb[MOUNT_UUID] && !tb[MOUNT_DEVICE])
return -1;
- if (!tb[MOUNT_TARGET])
+ if (tb[MOUNT_ENABLE] && !blobmsg_get_u32(tb[MOUNT_ENABLE]))
return -1;
m = malloc(sizeof(struct mount));
m->uuid = blobmsg_get_strdup(tb[MOUNT_UUID]);
m->label = blobmsg_get_strdup(tb[MOUNT_LABEL]);
m->target = blobmsg_get_strdup(tb[MOUNT_TARGET]);
- m->options = blobmsg_get_strdup(tb[MOUNT_OPTIONS]);
+ m->device = blobmsg_get_basename(tb[MOUNT_DEVICE]);
+
+ parse_mount_options(m, blobmsg_get_strdup(tb[MOUNT_OPTIONS]));
- if ((!tb[MOUNT_ENABLE]) || blobmsg_get_u32(tb[MOUNT_ENABLE]))
- vlist_add(&mounts, &m->node, m->target);
+ m->overlay = m->extroot = 0;
+ if (m->target && !strcmp(m->target, "/"))
+ m->extroot = 1;
+ if (m->target && !strcmp(m->target, "/overlay"))
+ m->extroot = m->overlay = 1;
+
+ if (m->uuid)
+ vlist_add(&mounts, &m->node, m->uuid);
+ else if (m->label)
+ vlist_add(&mounts, &m->node, m->label);
+ else if (m->device)
+ vlist_add(&mounts, &m->node, m->device);
return 0;
}
uci_to_blob(&b, s, &swap_attr_list);
blobmsg_parse(swap_policy, __SWAP_MAX, tb, blob_data(b.head), blob_len(b.head));
- if (!tb[SWAP_UUID])
+ if (!tb[SWAP_UUID] && !tb[SWAP_LABEL] && !tb[SWAP_DEVICE])
return -1;
m = malloc(sizeof(struct mount));
memset(m, 0, sizeof(struct mount));
m->type = TYPE_SWAP;
m->uuid = blobmsg_get_strdup(tb[SWAP_UUID]);
+ m->label = blobmsg_get_strdup(tb[SWAP_LABEL]);
+ m->device = blobmsg_get_basename(tb[SWAP_DEVICE]);
if (tb[SWAP_PRIO])
m->prio = blobmsg_get_u32(tb[SWAP_PRIO]);
if (m->prio)
m->prio = ((m->prio << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK) | SWAP_FLAG_PREFER;
- if ((!tb[SWAP_ENABLE]) || blobmsg_get_u32(tb[SWAP_ENABLE]))
- vlist_add(&mounts, &m->node, m->uuid);
+ if ((!tb[SWAP_ENABLE]) || blobmsg_get_u32(tb[SWAP_ENABLE])) {
+ /* store complete swap path */
+ if (tb[SWAP_DEVICE])
+ m->target = blobmsg_get_strdup(tb[SWAP_DEVICE]);
+
+ if (m->uuid)
+ vlist_add(&mounts, &m->node, m->uuid);
+ else if (m->label)
+ vlist_add(&mounts, &m->node, m->label);
+ else if (m->device)
+ vlist_add(&mounts, &m->node, m->device);
+ }
return 0;
}
-static struct mount* find_swap(const char *uuid)
+static int global_add(struct uci_section *s)
{
- struct mount *m;
+ struct blob_attr *tb[__CFG_MAX] = { 0 };
- if (!uuid)
- return NULL;
+ blob_buf_init(&b, 0);
+ uci_to_blob(&b, s, &config_attr_list);
+ blobmsg_parse(config_policy, __CFG_MAX, tb, blob_data(b.head), blob_len(b.head));
- vlist_for_each_element(&mounts, m, node)
- if ((m->type == TYPE_SWAP) && m->uuid && !strcmp(m->uuid, uuid))
+ if ((tb[CFG_ANON_MOUNT]) && blobmsg_get_u32(tb[CFG_ANON_MOUNT]))
+ anon_mount = 1;
+ if ((tb[CFG_ANON_SWAP]) && blobmsg_get_u32(tb[CFG_ANON_SWAP]))
+ anon_swap = 1;
+
+ if ((tb[CFG_AUTO_MOUNT]) && blobmsg_get_u32(tb[CFG_AUTO_MOUNT]))
+ auto_mount = 1;
+ if ((tb[CFG_AUTO_SWAP]) && blobmsg_get_u32(tb[CFG_AUTO_SWAP]))
+ auto_swap = 1;
+
+ if (tb[CFG_DELAY_ROOT])
+ delay_root = blobmsg_get_u32(tb[CFG_DELAY_ROOT]);
+
+ if ((tb[CFG_CHECK_FS]) && blobmsg_get_u32(tb[CFG_CHECK_FS]))
+ check_fs = 1;
+
+ return 0;
+}
+
+static struct mount* find_swap(const char *uuid, const char *label, const char *device)
+{
+ struct mount *m;
+
+ vlist_for_each_element(&mounts, m, node) {
+ if (m->type != TYPE_SWAP)
+ continue;
+ if (uuid && m->uuid && !strcmp(m->uuid, uuid))
return m;
+ if (label && m->label && !strcmp(m->label, label))
+ return m;
+ if (device && m->device && !strcmp(m->device, device))
+ return m;
+ }
return NULL;
}
-static struct mount* find_block(const char *uuid, const char *label, const char *target)
+static struct mount* find_block(const char *uuid, const char *label, const char *device,
+ const char *target)
{
struct mount *m;
vlist_for_each_element(&mounts, m, node) {
- if ((m->type == TYPE_MOUNT) && m->uuid && uuid && !strcmp(m->uuid, uuid))
+ if (m->type != TYPE_MOUNT)
+ continue;
+ if (m->uuid && uuid && !strcmp(m->uuid, uuid))
return m;
- if ((m->type == TYPE_MOUNT) && m->label && label && !strcmp(m->label, label))
+ if (m->label && label && !strcmp(m->label, label))
return m;
- if ((m->type == TYPE_MOUNT) && target && !strcmp(m->target, target))
+ if (m->target && target && !strcmp(m->target, target))
+ return m;
+ if (m->device && device && !strcmp(m->device, device))
return m;
}
mount_add(s);
if (!strcmp(s->type, "swap"))
swap_add(s);
+ if (!strcmp(s->type, "global"))
+ global_add(s);
}
vlist_flush(&mounts);
return 0;
}
+static struct blkid_struct_probe* _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;
+ }
+
+ return pr;
+}
+
static int _cache_load(const char *path)
{
int gl_flags = GLOB_NOESCAPE | GLOB_MARK;
return -1;
for (j = 0; j < gl.gl_pathc; j++) {
- struct blkid_struct_probe *pr = malloc(sizeof(struct blkid_struct_probe));
- memset(pr, 0, sizeof(struct blkid_struct_probe));
- probe_block(gl.gl_pathv[j], pr);
- if (pr->err)
- free(pr);
- else
+ struct blkid_struct_probe *pr = _probe_path(gl.gl_pathv[j]);
+ if (pr)
list_add_tail(&pr->list, &devices);
}
{
if (mtd)
_cache_load("/dev/mtdblock*");
+ _cache_load("/dev/mmcblk*");
_cache_load("/dev/sd*");
+ _cache_load("/dev/hd*");
+ _cache_load("/dev/md*");
+ _cache_load("/dev/mapper/*");
}
static int print_block_info(struct blkid_struct_probe *pr)
static int print_block_uci(struct blkid_struct_probe *pr)
{
- if (!pr->uuid[0])
- return 0;
-
if (!strcmp(pr->id->name, "swap")) {
printf("config 'swap'\n");
} else {
printf("config 'mount'\n");
printf("\toption\ttarget\t'/mnt/%s'\n", basename(pr->dev));
}
- printf("\toption\tuuid\t'%s'\n", pr->uuid);
+ if (pr->uuid[0])
+ 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;
if (label)
list_for_each_entry(pr, &devices, list)
- if (strcmp(pr->label, label))
+ if (!strcmp(pr->label, label))
return pr;
if (path)
list_for_each_entry(pr, &devices, list)
- if (!strcmp(pr->dev, path))
+ if (!strcmp(basename(pr->dev), basename(path)))
return pr;
return NULL;
char *p = &line[len + 1];
char *t = strstr(p, " ");
- if (!t)
+ if (!t) {
+ fclose(fp);
return NULL;
+ }
*t = '\0';
point = p;
break;
}
}
-static int main_hotplug(int argc, char **argv)
+static void check_filesystem(struct blkid_struct_probe *pr)
{
+ pid_t pid;
+ struct stat statbuf;
+ char *e2fsck = "/usr/sbin/e2fsck";
+
+ if (strncmp(pr->id->name, "ext", 3)) {
+ fprintf(stderr, "check_filesystem: %s is not supported\n", pr->id->name);
+ return;
+ }
+
+ if (stat(e2fsck, &statbuf) < 0) {
+ fprintf(stderr, "check_filesystem: %s not found\n", e2fsck);
+ return;
+ }
+
+ pid = fork();
+ if (!pid) {
+ execl(e2fsck, e2fsck, "-p", pr->dev, NULL);
+ exit(-1);
+ } else if (pid > 0) {
+ int status;
+
+ waitpid(pid, &status, 0);
+ if (WEXITSTATUS(status))
+ fprintf(stderr, "check_filesystem: %s returned %d\n", e2fsck, WEXITSTATUS(status));
+ }
+}
+
+static void handle_swapfiles(bool on)
+{
+ struct stat s;
struct mount *m;
- char path[256];
- char *action, *device, *mount_point;
struct blkid_struct_probe *pr;
+ vlist_for_each_element(&mounts, m, node)
+ {
+ if (m->type != TYPE_SWAP || !m->target)
+ continue;
+
+ if (stat(m->target, &s) || !S_ISREG(s.st_mode))
+ continue;
+
+ pr = _probe_path(m->target);
+
+ if (!pr)
+ continue;
+
+ if (!strcmp(pr->id->name, "swap")) {
+ if (on)
+ swapon(pr->dev, m->prio);
+ else
+ swapoff(pr->dev);
+ }
+
+ free(pr);
+ }
+}
+
+static int mount_device(struct blkid_struct_probe *pr, int hotplug)
+{
+ struct mount *m;
+ char *device;
+
+ if (!pr)
+ return -1;
+
+ device = basename(pr->dev);
+
+ if (!strcmp(pr->id->name, "swap")) {
+ if (hotplug && !auto_swap)
+ return -1;
+ m = find_swap(pr->uuid, pr->label, device);
+ if (m || anon_swap)
+ swapon(pr->dev, (m) ? (m->prio) : (0));
+
+ return 0;
+ }
+
+ if (hotplug && !auto_mount)
+ return -1;
+
+ if (find_mount_point(pr->dev)) {
+ fprintf(stderr, "%s is already mounted\n", pr->dev);
+ return -1;
+ }
+
+ m = find_block(pr->uuid, pr->label, device, NULL);
+ if (m && m->extroot)
+ return -1;
+
+ if (m) {
+ char *target = m->target;
+ char _target[32];
+ int err = 0;
+
+ if (!target) {
+ 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)
+ fprintf(stderr, "mounting %s (%s) as %s failed (%d) - %s\n",
+ pr->dev, pr->id->name, target, err, strerror(err));
+ else
+ handle_swapfiles(true);
+ return err;
+ }
+
+ if (anon_mount) {
+ char target[] = "/mnt/mmcblk123";
+ int err = 0;
+
+ snprintf(target, sizeof(target), "/mnt/%s", device);
+ mkdir_p(target);
+
+ if (check_fs)
+ check_filesystem(pr);
+
+ err = mount(pr->dev, target, pr->id->name, 0, "");
+ if (err)
+ fprintf(stderr, "mounting %s (%s) as %s failed (%d) - %s\n",
+ pr->dev, pr->id->name, target, err, strerror(err));
+ else
+ handle_swapfiles(true);
+ return err;
+ }
+
+ return 0;
+}
+
+static int umount_device(struct blkid_struct_probe *pr)
+{
+ 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);
+ if (!mp)
+ return -1;
+
+ m = find_block(pr->uuid, pr->label, device, NULL);
+ if (m && m->extroot)
+ return -1;
+
+ err = umount2(mp, MNT_DETACH);
+ if (err)
+ fprintf(stderr, "unmounting %s (%s) failed (%d) - %s\n",
+ pr->dev, mp, err, strerror(err));
+ else
+ fprintf(stderr, "unmounted %s (%s)\n",
+ pr->dev, mp);
+
+ return err;
+}
+
+static int main_hotplug(int argc, char **argv)
+{
+ char path[32];
+ char *action, *device, *mount_point;
+
action = getenv("ACTION");
device = getenv("DEVNAME");
err = umount2(mount_point, MNT_DETACH);
if (err)
- fprintf(stderr, "unmount of %s failed (%d) - %s\n",
+ fprintf(stderr, "umount of %s failed (%d) - %s\n",
mount_point, err, strerror(err));
return 0;
return -1;
cache_load(0);
- pr = find_block_info(NULL, NULL, path);
- if (!pr && pr->uuid) {
- fprintf(stderr, "failed to read blockinfo for %s\n", path);
- return -1;
- }
-
- m = find_swap(pr->uuid);
- if (m) {
- if (!strcmp(action, "add"))
- swapon(path, m->prio);
- else
- swapoff(path);
- } else {
- m = find_block(pr->uuid, pr->label, NULL);
- if (m && strcmp(m->target, "/")) {
- int err = 0;
-
- mkdir_p(m->target);
- err = mount(path, m->target, pr->id->name, 0, (m->options) ? (m->options) : (""));
- if (err)
- fprintf(stderr, "mounting %s (%s) as %s failed (%d) - %s\n",
- path, pr->id->name, m->target, err, strerror(err));
- }
- }
-
- return 0;
+ return mount_device(find_block_info(NULL, NULL, path), 1);
}
static int find_block_mtd(char *name, char *part, int plen)
if (!strcmp(pr->dev, fs)) {
struct stat s;
FILE *fp = NULL;
- char tag[32];
- char uuid[32] = { 0 };
+ char tag[64];
+ char uuid[64] = { 0 };
snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
if (stat(tag, &s)) {
return -1;
}
-static int mount_extroot(char *path, char *cfg)
+static int mount_extroot(char *cfg)
{
- struct blkid_struct_probe *pr;
+ char overlay[] = "/tmp/extroot/overlay";
+ char mnt[] = "/tmp/extroot/mnt";
+ char *path = mnt;
+ struct blkid_struct_probe *pr;
struct mount *m;
int err = -1;
if (config_load(cfg))
- return 2;
+ return -2;
- m = find_block(NULL, NULL, "/");
+ m = find_block(NULL, NULL, NULL, "/");
if (!m)
- return 1;
+ m = find_block(NULL, NULL, NULL, "/overlay");
+
+ if (!m || !m->extroot)
+ return -1;
- pr = find_block_info(m->uuid, m->label, NULL);
+ pr = find_block_info(m->uuid, m->label, m->device);
+
+ if (!pr && delay_root){
+ fprintf(stderr, "extroot: is not ready yet, retrying in %u seconds\n", delay_root);
+ sleep(delay_root);
+ mkblkdev();
+ cache_load(0);
+ pr = find_block_info(m->uuid, m->label, m->device);
+ }
if (pr) {
+ if (strncmp(pr->id->name, "ext", 3)) {
+ fprintf(stderr, "extroot: %s is not supported, try ext4\n", pr->id->name);
+ 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) : (""));
if (err) {
fprintf(stderr, "mounting %s (%s) as %s failed (%d) - %s\n",
pr->dev, pr->id->name, path, err, strerror(err));
- } else {
+ } else if (m->overlay) {
err = check_extroot(path);
if (err)
umount(path);
struct blkid_struct_probe *pr;
char fs[32] = { 0 };
char fs_data[32] = { 0 };
- int err = 1;
- char extroot[] = "/tmp/overlay";
+ int err = -1;
if (!getenv("PREINIT"))
return -1;
if (argc != 2) {
fprintf(stderr, "Usage: block extroot mountpoint\n");
- return 1;
+ return -1;
}
mkblkdev();
find_block_mtd("rootfs", fs, sizeof(fs));
if (!fs[0])
- return 2;
+ return -2;
pr = find_block_info(NULL, NULL, fs);
- if (!pr || strcmp(pr->id->name, "squashfs"))
- return 3;
+ if (!pr)
+ return -3;
find_block_mtd("rootfs_data", fs_data, sizeof(fs_data));
if (fs_data[0]) {
mkdir_p(cfg);
if (!mount(fs_data, cfg, "jffs2", MS_NOATIME, NULL)) {
- err = mount_extroot(extroot, cfg);
+ err = mount_extroot(cfg);
umount2(cfg, MNT_DETACH);
}
- if (err)
- rmdir(extroot);
+ if (err < 0)
+ rmdir("/tmp/overlay");
rmdir(cfg);
return err;
}
}
- err = mount_extroot(extroot, NULL);
+ return mount_extroot(NULL);
+}
+
+static int main_mount(int argc, char **argv)
+{
+ struct blkid_struct_probe *pr;
- return err;
+ if (config_load(NULL))
+ return -1;
+
+ cache_load(1);
+ list_for_each_entry(pr, &devices, list)
+ mount_device(pr, 0);
+
+ handle_swapfiles(true);
+
+ return 0;
+}
+
+static int main_umount(int argc, char **argv)
+{
+ struct blkid_struct_probe *pr;
+
+ if (config_load(NULL))
+ return -1;
+
+ handle_swapfiles(false);
+
+ cache_load(0);
+ list_for_each_entry(pr, &devices, list)
+ umount_device(pr);
+
+ return 0;
}
static int main_detect(int argc, char **argv)
struct blkid_struct_probe *pr;
cache_load(0);
+ printf("config 'global'\n");
+ printf("\toption\tanon_swap\t'0'\n");
+ printf("\toption\tanon_mount\t'0'\n");
+ printf("\toption\tauto_swap\t'1'\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);
return 0;
}
+static int swapon_usage(void)
+{
+ fprintf(stderr, "Usage: swapon [-s] [-a] [[-p pri] DEVICE]\n\n"
+ "\tStart swapping on [DEVICE]\n"
+ " -a\tStart swapping on all swap devices\n"
+ " -p pri\tSet priority of swap device\n"
+ " -s\tShow summary\n");
+ return -1;
+}
+
static int main_swapon(int argc, char **argv)
{
- if (argc != 2) {
- fprintf(stderr, "Usage: swapoff [-a] [DEVICE]\n\nStop swapping on DEVICE\n\n\t-a Stop swapping on all swap devices\n");
- return -1;
- }
+ int ch;
+ FILE *fp;
+ char *lineptr;
+ size_t s;
+ struct blkid_struct_probe *pr;
+ int flags = 0;
+ int pri;
+ struct stat st;
+ int err;
- if (!strcmp(argv[1], "-a")) {
- struct blkid_struct_probe *pr;
+ while ((ch = getopt(argc, argv, "ap:s")) != -1) {
+ switch(ch) {
+ case 's':
+ fp = fopen("/proc/swaps", "r");
+ lineptr = NULL;
- cache_load(0);
- list_for_each_entry(pr, &devices, list) {
- if (strcmp(pr->id->name, "swap"))
- continue;
- if (swapon(pr->dev, 0))
- fprintf(stderr, "failed to swapon %s\n", pr->dev);
+ if (!fp) {
+ fprintf(stderr, "failed to open /proc/swaps\n");
+ return -1;
+ }
+ while (getline(&lineptr, &s, fp) > 0)
+ printf(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"))
+ continue;
+ if (swapon(pr->dev, 0))
+ fprintf(stderr, "failed to swapon %s\n", pr->dev);
+ }
+ return 0;
+ case 'p':
+ pri = atoi(optarg);
+ if (pri >= 0)
+ flags = ((pri << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK) | SWAP_FLAG_PREFER;
+ break;
+ default:
+ return swapon_usage();
}
- } else {
- struct stat s;
- int err;
- if (stat(argv[1], &s) || !S_ISBLK(s.st_mode)) {
- fprintf(stderr, "%s is not a block device\n", argv[1]);
- return -1;
- }
- err = swapon(argv[1], 0);
- if (err) {
- fprintf(stderr, "failed to swapon %s (%d)\n", argv[1], err);
- return err;
- }
+ }
+
+ if (optind != (argc - 1))
+ return swapon_usage();
+
+ if (stat(argv[optind], &st) || (!S_ISBLK(st.st_mode) && !S_ISREG(st.st_mode))) {
+ fprintf(stderr, "%s is not a block device or file\n", argv[optind]);
+ return -1;
+ }
+ err = swapon(argv[optind], flags);
+ if (err) {
+ fprintf(stderr, "failed to swapon %s (%d)\n", argv[optind], err);
+ return err;
}
return 0;
static int main_swapoff(int argc, char **argv)
{
if (argc != 2) {
- fprintf(stderr, "Usage: swapoff [-a] [DEVICE]\n\nStop swapping on DEVICE\n\n\t-a Stop swapping on all swap devices\n");
+ fprintf(stderr, "Usage: swapoff [-a] [DEVICE]\n\n"
+ "\tStop swapping on DEVICE\n"
+ " -a\tStop swapping on all swap devices\n");
return -1;
}
struct stat s;
int err;
- if (stat(argv[1], &s) || !S_ISBLK(s.st_mode)) {
- fprintf(stderr, "%s is not a block device\n", argv[1]);
+ if (stat(argv[1], &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode))) {
+ fprintf(stderr, "%s is not a block device or file\n", argv[1]);
return -1;
}
err = swapoff(argv[1]);
{
char *base = basename(*argv);
+ umask(0);
+
if (!strcmp(base, "swapon"))
return main_swapon(argc, argv);
if (!strcmp(argv[1], "extroot"))
return main_extroot(argc, argv);
+
+ if (!strcmp(argv[1], "mount"))
+ return main_mount(argc, argv);
+
+ if (!strcmp(argv[1], "umount"))
+ return main_umount(argc, argv);
}
- fprintf(stderr, "Usage: block <info|detect>\n");
+ fprintf(stderr, "Usage: block <info|mount|umount|detect>\n");
return -1;
}
projects / project / ubox.git / blobdiff