block: fix find_block_info() by label
[project/ubox.git] / block.c
diff --git a/block.c b/block.c
index 15f4b0f..aa37e24 100644 (file)
--- a/block.c
+++ b/block.c
@@ -12,6 +12,8 @@
  * GNU General Public License for more details.
  */
 
+#define _GNU_SOURCE
+#include <getopt.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <syslog.h>
@@ -46,6 +48,7 @@ struct mount {
        char *target;
        char *path;
        char *options;
+       uint32_t flags;
        char *uuid;
        char *label;
        char *device;
@@ -112,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
@@ -120,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 },
 };
@@ -129,6 +134,46 @@ static const struct uci_blob_param_list swap_attr_list = {
        .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)
@@ -145,6 +190,52 @@ static char *blobmsg_get_basename(struct blob_attr *attr)
        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 };
@@ -165,8 +256,10 @@ static int mount_add(struct uci_section *s)
        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]));
+
        m->overlay = m->extroot = 0;
        if (m->target && !strcmp(m->target, "/"))
                m->extroot = 1;
@@ -192,21 +285,32 @@ 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]);
        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) ? (m->uuid) : (m->device));
+       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;
 }
@@ -238,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;
 
@@ -247,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;
        }
@@ -314,6 +420,26 @@ static int config_load(char *cfg)
        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;
@@ -324,12 +450,8 @@ static int _cache_load(const char *path)
                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);
        }
 
@@ -344,6 +466,10 @@ static void cache_load(int mtd)
                _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)
@@ -377,7 +503,7 @@ static int print_block_uci(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;
@@ -394,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)
@@ -420,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;
@@ -456,11 +584,10 @@ static void check_filesystem(struct blkid_struct_probe *pr)
                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) {
@@ -468,22 +595,57 @@ static void check_filesystem(struct blkid_struct_probe *pr)
                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;
+       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 = 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;
-               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));
 
@@ -504,7 +666,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
 
        if (m) {
                char *target = m->target;
-               char _target[] = "/mnt/mmcblk123";
+               char _target[32];
                int err = 0;
 
                if (!target) {
@@ -516,10 +678,13 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
                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));
+               else
+                       handle_swapfiles(true);
                return err;
        }
 
@@ -537,6 +702,8 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
                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;
        }
 
@@ -654,8 +821,8 @@ static int check_extroot(char *path)
                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)) {
@@ -688,8 +855,8 @@ static int check_extroot(char *path)
 
 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;
@@ -708,8 +875,10 @@ static int mount_extroot(char *cfg)
        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) {
@@ -793,10 +962,12 @@ static int main_mount(int argc, char **argv)
        if (config_load(NULL))
                return -1;
 
-       cache_load(0);
+       cache_load(1);
        list_for_each_entry(pr, &devices, list)
                mount_device(pr, 0);
 
+       handle_swapfiles(true);
+
        return 0;
 }
 
@@ -807,6 +978,8 @@ static int main_umount(int argc, char **argv)
        if (config_load(NULL))
                return -1;
 
+       handle_swapfiles(false);
+
        cache_load(0);
        list_for_each_entry(pr, &devices, list)
                umount_device(pr);
@@ -824,7 +997,7 @@ static int main_detect(int argc, char **argv)
        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);
@@ -864,36 +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: 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;
@@ -902,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\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;
        }
 
@@ -931,8 +1145,8 @@ static int main_swapoff(int argc, char **argv)
                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]);