block: stage extroot mounts in /tmp/extroot since /tmp/overlay might be in use by...

[project/ubox.git] / block.c

diff --git a/block.c b/block.c
index d0fce7e..e8f7d3c 100644 (file)
--- a/block.c
+++ b/block.c
@@ -12,6 +12,7 @@
  * GNU General Public License for more details.
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <unistd.h>
 #include <syslog.h>
@@ -137,6 +138,14 @@ static char *blobmsg_get_strdup(struct blob_attr *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 int mount_add(struct uci_section *s)
 {
        struct blob_attr *tb[__MOUNT_MAX] = { 0 };
@@ -158,7 +167,7 @@ static int mount_add(struct uci_section *s)
        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]);
        m->overlay = m->extroot = 0;
        if (m->target && !strcmp(m->target, "/"))
                m->extroot = 1;
@@ -191,7 +200,7 @@ static int swap_add(struct uci_section *s)
        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)
@@ -319,7 +328,7 @@ static int _cache_load(const char *path)
                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);
@@ -336,6 +345,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)
@@ -369,7 +382,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;
@@ -448,11 +461,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) {
@@ -460,18 +472,23 @@ 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 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;
@@ -496,7 +513,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) {
@@ -646,7 +663,7 @@ static int check_extroot(char *path)
                if (!strcmp(pr->dev, fs)) {
                        struct stat s;
                        FILE *fp = NULL;
-                       char tag[32];
+                       char tag[64];
                        char uuid[32] = { 0 };
 
                        snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
@@ -680,8 +697,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;
@@ -702,6 +719,8 @@ static int mount_extroot(char *cfg)
        if (!pr && delay_root){
                fprintf(stderr, "extroot: is not ready yet, retrying in %ui seconds\n", delay_root);
                sleep(delay_root);
+               mkblkdev();
+               cache_load(0);
                pr = find_block_info(m->uuid, m->label, NULL);
        }
        if (pr) {
@@ -785,7 +804,7 @@ 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);
 
@@ -859,11 +878,25 @@ static int main_info(int argc, char **argv)
 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);
@@ -877,8 +910,8 @@ static int main_swapon(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 = swapon(argv[1], 0);
@@ -894,7 +927,7 @@ 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;
        }
 
@@ -923,8 +956,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]);