[Pkg-libvirt-commits] [libvirt] 07/10: Disable use of namespaces by default

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch debian/experimental
in repository libvirt.

commit 43e4ddc4e4a5914dfbe33dc52e7d3622cba4f25f
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jan 19 18:51:04 2017 +0100

    Disable use of namespaces by default
---
 .../Disable-use-of-namespaces-by-default.patch     | 30 ++++++++++++++++++++++
 debian/patches/debian/remove-RHism.diff.patch      |  2 +-
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/debian/patches/Disable-use-of-namespaces-by-default.patch b/debian/patches/Disable-use-of-namespaces-by-default.patch
new file mode 100644
index 0000000..3f45ea3
--- /dev/null
+++ b/debian/patches/Disable-use-of-namespaces-by-default.patch
@@ -0,0 +1,30 @@
+From: "Daniel P. Berrange" <berrange at redhat.com>
+Date: Wed, 18 Jan 2017 10:48:12 +0000
+Subject: Disable use of namespaces by default
+
+When namespaces are enabled there is currently breakage when
+using disk hotplug and when using AppArmor
+
+Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
+---
+ src/qemu/qemu_conf.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 6613d59..aa05b46 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -317,13 +317,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
+     if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST)))
+         goto error;
+ 
+-#if defined(__linux__)
+-    if (privileged &&
+-        virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_MNT) == 0 &&
+-        virBitmapSetBit(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) < 0)
+-        goto error;
+-#endif /* defined(__linux__) */
+-
+ #ifdef DEFAULT_LOADER_NVRAM
+     if (virFirmwareParseList(DEFAULT_LOADER_NVRAM,
+                              &cfg->firmwares,
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 75a5879..d17949f 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index cfa7a24..0940b71 100644
+index 0e434c0..c35041a 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
diff --git a/debian/patches/series b/debian/patches/series
index 4f1c224..462605e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ Set-defaults-for-zfs-tools.patch
 Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
 openpty-Skip-test-if-no-pty-is-available.patch
 test-posix_openpt-don-t-fail-on-EACCESS.patch
+Disable-use-of-namespaces-by-default.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git