* GNU General Public License for more details.
*/
+#define _GNU_SOURCE
#include <stdio.h>
#include <unistd.h>
#include <syslog.h>
char *target;
char *path;
char *options;
+ uint32_t flags;
char *uuid;
char *label;
char *device;
.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 };
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_strdup(tb[MOUNT_DEVICE]);
+ m->device = blobmsg_get_basename(tb[MOUNT_DEVICE]);
+
+ parse_mount_options(m, blobmsg_get_strdup(tb[MOUNT_OPTIONS]));
+
m->overlay = m->extroot = 0;
if (m->target && !strcmp(m->target, "/"))
m->extroot = 1;
memset(m, 0, sizeof(struct mount));
m->type = TYPE_SWAP;
m->uuid = blobmsg_get_strdup(tb[SWAP_UUID]);
- m->device = blobmsg_get_strdup(tb[SWAP_DEVICE]);
+ m->device = blobmsg_get_basename(tb[SWAP_DEVICE]);
if (tb[SWAP_PRIO])
m->prio = blobmsg_get_u32(tb[SWAP_PRIO]);
if (m->prio)
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)
+ if (pr->err || !pr->id)
free(pr);
else
list_add_tail(&pr->list, &devices);
_cache_load("/dev/mtdblock*");
_cache_load("/dev/mmcblk*");
_cache_load("/dev/sd*");
+ _cache_load("/dev/sdc*");
+ _cache_load("/dev/hd*");
+ _cache_load("/dev/md*");
+ _cache_load("/dev/mapper/*");
}
static int print_block_info(struct blkid_struct_probe *pr)
if (pr->uuid[0])
printf("\toption\tuuid\t'%s'\n", pr->uuid);
else
- printf("\toption\tdevice\t'%s'\n", basename(pr->dev));
+ printf("\toption\tdevice\t'%s'\n", pr->dev);
printf("\toption\tenabled\t'0'\n\n");
return 0;
return;
}
- if (stat(e2fsck, &statbuf) < 0)
- return;
-
- if (!(statbuf.st_mode & S_IXUSR))
+ if (stat(e2fsck, &statbuf) < 0) {
+ fprintf(stderr, "check_filesystem: %s not found\n", e2fsck);
return;
+ }
pid = fork();
if (!pid) {
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 int mount_device(struct blkid_struct_probe *pr, int hotplug)
{
struct mount *m;
- char *device = basename(pr->dev);
+ char *device;
if (!pr)
return -1;
+ device = basename(pr->dev);
+
if (!strcmp(pr->id->name, "swap")) {
if (hotplug && !auto_swap)
return -1;
if (m) {
char *target = m->target;
- char _target[] = "/mnt/mmcblk123";
+ char _target[32];
int err = 0;
if (!target) {
if (check_fs)
check_filesystem(pr);
- err = mount(pr->dev, target, pr->id->name, 0, (m->options) ? (m->options) : (""));
+ 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));
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)) {
static int mount_extroot(char *cfg)
{
- char overlay[] = "/tmp/overlay";
- char mnt[] = "/tmp/mnt";
+ char overlay[] = "/tmp/extroot/overlay";
+ char mnt[] = "/tmp/extroot/mnt";
char *path = mnt;
struct blkid_struct_probe *pr;
struct mount *m;
pr = find_block_info(m->uuid, m->label, NULL);
if (!pr && delay_root){
- fprintf(stderr, "extroot: is not ready yet, retrying in %ui seconds\n", 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, NULL);
}
if (pr) {
if (config_load(NULL))
return -1;
- cache_load(0);
+ cache_load(1);
list_for_each_entry(pr, &devices, list)
mount_device(pr, 0);
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'0'\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);
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");
+ fprintf(stderr, "Usage: swapon <-s> <-a> [DEVICE]\n\n\tStart swapping on [DEVICE]\n -a\tStart swapping on all swap devices\n -s\tShow summary\n");
return -1;
}
- if (!strcmp(argv[1], "-a")) {
+ if (!strcmp(argv[1], "-s")) {
+ FILE *fp = fopen("/proc/swaps", "r");
+ char *lineptr = NULL;
+ size_t s;
+
+ 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);
+ } else if (!strcmp(argv[1], "-a")) {
struct blkid_struct_probe *pr;
cache_load(0);
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 = swapon(argv[1], 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]);
projects / project / ubox.git / blobdiff