Fix automatic mounts without a rootfs

Signed-off-by: David Ward <david.ward@ll.mit.edu>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 30b84921bd6e7206fe18333ce99fd197a9f85b95..f298226c3e52de5c090d72965dacd94aee132174 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -790,7 +790,7 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
 
                        if (default_mounts[i].source) {
                                /* will act like strdup if %r is not present */
-                               source = lxc_string_replace("%r", conf->rootfs.mount, default_mounts[i].source);
+                               source = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mounts[i].source);
                                if (!source) {
                                        SYSERROR("memory allocation error");
                                        return -1;
@@ -798,7 +798,7 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
                        }
                        if (default_mounts[i].destination) {
                                /* will act like strdup if %r is not present */
-                               destination = lxc_string_replace("%r", conf->rootfs.mount, default_mounts[i].destination);
+                               destination = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mounts[i].destination);
                                if (!destination) {
                                        saved_errno = errno;
                                        SYSERROR("memory allocation error");
@@ -853,7 +853,7 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
                        }
                }
 
-               if (!cgroup_mount(conf->rootfs.mount, handler, cg_flags)) {
+               if (!cgroup_mount(conf->rootfs.path ? conf->rootfs.mount : "", handler, cg_flags)) {
                        SYSERROR("error mounting /sys/fs/cgroup");
                        return -1;
                }