mirrors/genimage
0
0
Fork 0
mirror of https://github.com/pengutronix/genimage.git synced 2024-11-27 03:33:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

genimage: fix partitions from sub-sub dirs

Browse Source 
genimage works on partitions from sub dirs (e.g.: /opt), but it fails from
sub-sub dirs (e.g.: /usr/local). This patch fixes the problem by using a
sanitized sub dir name instead, where slashes '/' are replaces by minuses '-'.

Fixes: Issue #2.

Suggested-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2017-12-04 14:47:37 +01:00
parent 07ba822bc1
commit 5b2a54f72e
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
genimage.c
View File

@ -347,18 +347,37 @@ static struct mountpoint *get_mountpoint(const char *path)
return NULL;
}
static inline char *sanitize_path(const char *path)
{
char *path_sanitized;
char *c;
path_sanitized = strdup(path);
c = path_sanitized;
while ((c = strchr(c, '/'))) {
*c = '-';
c++;
}
return path_sanitized;
}
static struct mountpoint *add_mountpoint(const char *path)
{
struct mountpoint *mp;
char *path_sanitized;
mp = get_mountpoint(path);
if (mp)
return mp;
path_sanitized = sanitize_path(path);
mp = xzalloc(sizeof(*mp));
mp->path = strdup(path);
xasprintf(&mp->mountpath, "%s/%s", tmppath(), mp->path);
xasprintf(&mp->mountpath, "%s/%s", tmppath(), path_sanitized);
list_add_tail(&mp->list, &mountpoints);
free(path_sanitized);
return mp;
}
@ -397,7 +416,7 @@ static int collect_mountpoints(void)
list_for_each_entry(mp, &mountpoints, list) {
if (!strlen(mp->path))
continue;
ret = systemp(NULL, "mv %s/root/%s %s", tmppath(), mp->path, tmppath());
ret = systemp(NULL, "mv %s/root/%s %s", tmppath(), mp->path, mp->mountpath);
if (ret)
return ret;
ret = systemp(NULL, "mkdir %s/root/%s", tmppath(), mp->path);