From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 22 Mar 2013 13:52:55 +0000 (+0000)
Subject: Move FUSE mount to /var/lib/libvirt/lxc/$NAME.fuse
X-Git-Tag: v1.0.4-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05f664b12c1c034d0d523f1d70b6fa38566f47e8;p=thirdparty%2Flibvirt.git

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 4d097911a6..bf17a38184 100644
--- 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 c4be58ebdd..fbd0d56c95 100644
--- 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;