libvirt: Try to fix selinux/securityfs mount handling in LXC

The current behavior for libvirt containers is to
configure a set of "basic" mounts in the new container
environment by default. Some of these mounts, such as
securityfs or selinux, might not have kernel support on
all running platforms. The added patchset implements
proper handling for this case and makes some additional
cleanups and refactoring.

The patchset is taken from the upstream libvirt mailing
list. Please refer to:

https://www.redhat.com/archives/libvir-list/2013-October/msg00270.html

Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 78 insertions, 0 deletions

diff --git a/recipes-extended/libvirt/libvirt/0003-Remove-pointless-srcpath-variable-in-lxcContainerMountBasicFS.patch b/recipes-extended/libvirt/libvirt/0003-Remove-pointless-srcpath-variable-in-lxcContainerMountBasicFS.patch
new file mode 100644
index 00000000..5135fb01
--- /dev/null
+++ b/recipes-extended/libvirt/libvirt/0003-Remove-pointless-srcpath-variable-in-lxcContainerMountBasicFS.patch
@@ -0,0 +1,78 @@
+From: "Daniel P. Berrange" <berrange@redhat.com>
+To: libvir-list@redhat.com
+Date: Mon,  7 Oct 2013 14:06:48 +0100
+Message-Id: <1381151211-27111-4-git-send-email-berrange@redhat.com>
+In-Reply-To: <1381151211-27111-1-git-send-email-berrange@redhat.com>
+References: <1381151211-27111-1-git-send-email-berrange@redhat.com>
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-loop: libvir-list@redhat.com
+Subject: [libvirt] [PATCH 3/6] Remove pointless 'srcpath' variable in
+        lxcContainerMountBasicFS
+X-BeenThere: libvir-list@redhat.com
+X-Mailman-Version: 2.1.12
+Precedence: junk
+List-Id: Development discussions about the libvirt library & tools
+        <libvir-list.redhat.com>
+List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
+        <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
+List-Archive: <https://www.redhat.com/archives/libvir-list>
+List-Post: <mailto:libvir-list@redhat.com>
+List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
+List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
+        <mailto:libvir-list-request@redhat.com?subject=subscribe>
+X-List-Received-Date: Mon, 07 Oct 2013 13:06:59 -0000
+
+From: "Daniel P. Berrange" <berrange@redhat.com>
+
+The 'srcpath' variable is initialized from 'mnt->src' and never
+changed thereafter. Some places continue to use 'mnt->src' and
+others use 'srcpath'. Remove the pointless 'srcpath' variable
+and use 'mnt->src' everywhere.
+
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+---
+ src/lxc/lxc_container.c | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
+index 3c89ed7..1b1c93b 100644
+--- a/src/lxc/lxc_container.c
++++ b/src/lxc/lxc_container.c
+@@ -853,16 +853,13 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
+ 
+     for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) {
+         virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i];
+-        const char *srcpath = NULL;
+ 
+         VIR_DEBUG("Processing %s -> %s",
+                   mnt->src, mnt->dst);
+ 
+-        srcpath = mnt->src;
+-
+         /* Skip if mount doesn't exist in source */
+-        if ((srcpath[0] == '/') &&
+-            (access(srcpath, R_OK) < 0))
++        if ((mnt->src[0] == '/') &&
++            (access(mnt->src, R_OK) < 0))
+             continue;
+ 
+ #if WITH_SELINUX
+@@ -882,11 +879,11 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
+         }
+ 
+         VIR_DEBUG("Mount %s on %s type=%s flags=%x",
+-                  srcpath, mnt->dst, mnt->type, mnt->mflags);
+-        if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
++                  mnt->src, mnt->dst, mnt->type, mnt->mflags);
++        if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
+             virReportSystemError(errno,
+                                  _("Failed to mount %s on %s type %s flags=%x"),
+-                                 srcpath, mnt->dst, NULLSTR(mnt->type),
++                                 mnt->src, mnt->dst, NULLSTR(mnt->type),
+                                  mnt->mflags);
+             goto cleanup;
+         }
+-- 
+1.8.3.1
+
+