Move FUSE mount to /var/lib/libvirt/lxc/$NAME.fuse

Instead of using /var/lib/libvirt/lxc/$NAME for the FUSE
filesystem, use /var/lib/libvirt/lxc/$NAME.fuse. This allows
room for other temporary mounts in the same directory

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 4d097911a6d67a670c045400b0fb0f247a9a93a7..bf17a38184343a11184dd155e0e6898761779b5e 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -604,7 +604,7 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def,
     char *meminfo_path = NULL;
 
     if ((ret = virAsprintf(&meminfo_path,
-                           "%s/%s/%s/meminfo",
+                           "%s/%s/%s.fuse/meminfo",
                            srcprefix ? srcprefix : "", LXC_STATE_DIR,
                            def->name)) < 0)
         return ret;

diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index c4be58ebdd8a27b34bcbed944b6f61be0d90f199..fbd0d56c9517ffd16b60ff4a6fe959b7afcc66a7 100644 (file)
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -291,7 +291,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def)
     if (virMutexInit(&fuse->lock) < 0)
         goto cleanup2;
 
-    if (virAsprintf(&fuse->mountpoint, "%s/%s/", LXC_STATE_DIR,
+    if (virAsprintf(&fuse->mountpoint, "%s/%s.fuse/", LXC_STATE_DIR,
                     def->name) < 0) {
         virReportOOMError();
         goto cleanup1;