lxcapi_clone: set the right environment variable for mounted fs

If the container is dir-backed, we don't actually mount it (to support unprivileged use). So always set the LXC_ROOTFS_MOUNT to bdev->dest, not to the rootfs path specified in the container configuration. This should fix bug http://pad.lv/1253573Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lxcapi_clone: set the right environment variable for mounted fs
24ef39f4 · Serge Hallyn · Stéphane Graber · bc6928ff · 24ef39f4
Commit 24ef39f4 authored Nov 21, 2013 by Serge Hallyn Committed by Stéphane Graber Nov 21, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lxccontainer.c src/lxc/lxccontainer.c +1 -1

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2399,7 +2399,7 @@ static int clone_update_rootfs(struct lxc_container *c0,
 		if (setenv("LXC_CONFIG_FILE", conf->rcfile, 1)) {
 			SYSERROR("failed to set environment variable for config path");
 		}
-		if (setenv("LXC_ROOTFS_MOUNT", conf->rootfs.mount, 1)) {
+		if (setenv("LXC_ROOTFS_MOUNT", bdev->dest, 1)) {
 			SYSERROR("failed to set environment variable for rootfs mount");
 		}
 		if (setenv("LXC_ROOTFS_PATH", conf->rootfs.path, 1)) {