Revert "storage: handle prefixed rootfs paths"

This reverts commit 84ae4b69653268029206317aabd5aaefa1f6a590.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/bdev/lxcoverlay.c b/src/lxc/bdev/lxcoverlay.c
index 18fb2754f2d8b2af7205ad26535bd841bb77b31f..65daed8dbb76434b315bc4b27c0b0f08ef5f8ae0 100644 (file)
--- a/src/lxc/bdev/lxcoverlay.c
+++ b/src/lxc/bdev/lxcoverlay.c
@@ -58,8 +58,6 @@ int ovl_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname,
                   const char *cname, const char *oldpath, const char *lxcpath,
                   int snap, uint64_t newsize, struct lxc_conf *conf)
 {
-        char *src;
-
        if (!snap) {
                ERROR("overlayfs is only for snapshot clones");
                return -22;
@@ -135,15 +133,14 @@ int ovl_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname,
                        WARN("Failed to update ownership of %s", work);
                free(work);
 
-               src = lxc_storage_get_path(orig->src, orig->type);
                // the src will be 'overlayfs:lowerdir:upperdir'
-               len = strlen(delta) + strlen(src) + 12;
+               len = strlen(delta) + strlen(orig->src) + 12;
                new->src = malloc(len);
                if (!new->src) {
                        free(delta);
                        return -ENOMEM;
                }
-               ret = snprintf(new->src, len, "overlayfs:%s:%s", src, delta);
+               ret = snprintf(new->src, len, "overlayfs:%s:%s", orig->src, delta);
                free(delta);
                if (ret < 0 || ret >= len)
                        return -ENOMEM;