block: stage extroot mounts in /tmp/extroot since /tmp/overlay might be in use by...
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 26 Jul 2013 08:57:30 +0000 (10:57 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 26 Jul 2013 08:57:30 +0000 (10:57 +0200)
block.c

diff --git a/block.c b/block.c
index b5bc4941cafe5b363801f363085f6853edabf73b..e8f7d3c2a17d7e26dab9c1b4efd5aaeead913515 100644 (file)
--- a/block.c
+++ b/block.c
@@ -663,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);
@@ -697,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;