X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=block.c;h=aa37e24c55698a01dd7751f3c99740c6731ecb5e;hp=2fce291db643bf0b1363a143df2390e3178da096;hb=aacfc5704922d65a6b875c85b17a0cd803a70364;hpb=5fbedc0167658665c259f86f97143b4411f97dd1 diff --git a/block.c b/block.c index 2fce291..aa37e24 100644 --- a/block.c +++ b/block.c @@ -13,6 +13,7 @@ */ #define _GNU_SOURCE +#include #include #include #include @@ -114,6 +115,7 @@ static const struct uci_blob_param_list mount_attr_list = { enum { SWAP_ENABLE, SWAP_UUID, + SWAP_LABEL, SWAP_DEVICE, SWAP_PRIO, __SWAP_MAX @@ -122,6 +124,7 @@ enum { 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 }, }; @@ -282,13 +285,14 @@ static int swap_add(struct uci_section *s) 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] && !tb[SWAP_DEVICE]) + 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]); @@ -299,7 +303,13 @@ static int swap_add(struct uci_section *s) /* store complete swap path */ if (tb[SWAP_DEVICE]) m->target = blobmsg_get_strdup(tb[SWAP_DEVICE]); - vlist_add(&mounts, &m->node, (m->uuid) ? (m->uuid) : (m->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; @@ -332,7 +342,7 @@ static int global_add(struct uci_section *s) return 0; } -static struct mount* find_swap(const char *uuid, const char *device) +static struct mount* find_swap(const char *uuid, const char *label, const char *device) { struct mount *m; @@ -341,6 +351,8 @@ static struct mount* find_swap(const char *uuid, const char *device) 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; } @@ -508,7 +520,7 @@ static struct blkid_struct_probe* find_block_info(char *uuid, char *label, char if (label) list_for_each_entry(pr, &devices, list) - if (strcmp(pr->label, label)) + if (!strcmp(pr->label, label)) return pr; if (path) @@ -534,8 +546,10 @@ static char* find_mount_point(char *block) char *p = &line[len + 1]; char *t = strstr(p, " "); - if (!t) + if (!t) { + fclose(fp); return NULL; + } *t = '\0'; point = p; break; @@ -599,8 +613,6 @@ static void handle_swapfiles(bool on) if (m->type != TYPE_SWAP || !m->target) continue; - fprintf(stderr, "swapfile: %s\n", m->target); - if (stat(m->target, &s) || !S_ISREG(s.st_mode)) continue; @@ -609,8 +621,6 @@ static void handle_swapfiles(bool on) if (!pr) continue; - fprintf(stderr, "probe: %p\n", pr); - if (!strcmp(pr->id->name, "swap")) { if (on) swapon(pr->dev, m->prio); @@ -635,7 +645,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug) if (!strcmp(pr->id->name, "swap")) { if (hotplug && !auto_swap) return -1; - m = find_swap(pr->uuid, device); + m = find_swap(pr->uuid, pr->label, device); if (m || anon_swap) swapon(pr->dev, (m) ? (m->prio) : (0)); @@ -956,6 +966,8 @@ static int main_mount(int argc, char **argv) list_for_each_entry(pr, &devices, list) mount_device(pr, 0); + handle_swapfiles(true); + return 0; } @@ -1025,50 +1037,75 @@ static int main_info(int argc, char **argv) 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: 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; - } + 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], "-s")) { - FILE *fp = fopen("/proc/swaps", "r"); - char *lineptr = NULL; - size_t s; + while ((ch = getopt(argc, argv, "ap:s")) != -1) { + switch(ch) { + case 's': + fp = fopen("/proc/swaps", "r"); + lineptr = NULL; - if (!fp) { - fprintf(stderr, "failed to open /proc/swaps\n"); - return -1; + 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(); } - 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); - 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); - } - } else { - struct stat s; - int err; + } - 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); - 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; @@ -1077,7 +1114,9 @@ static int main_swapon(int argc, char **argv) static int main_swapoff(int argc, char **argv) { if (argc != 2) { - fprintf(stderr, "Usage: swapoff [-a] [DEVICE]\n\n\tStop swapping on DEVICE\n -a\tStop 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; }