[Pkg-libvirt-commits] [libvirt] 02/03: virt-host-validate: require fuse for LXC if compiled in

[Guido Guenther]

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

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

commit e0e0a428e892dbd9e3877f07c53469e818b27339
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Oct 12 18:00:03 2017 +0200

    virt-host-validate: require fuse for LXC if compiled in
    
    This should make us skip the lxc test properly on debci.
---
 debian/patches/series                              |  1 +
 ...idate-require-fuse-for-LXC-if-compiled-in.patch | 33 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index e2280b7..48b4ea5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ debian/apparmor_profiles_local_include.patch
 Set-defaults-for-zfs-tools.patch
 Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
 apparmor-add-dnsmasq-ptrace-rule-to-libvirtd-profile.patch
+virt-host-validate-require-fuse-for-LXC-if-compiled-in.patch
diff --git a/debian/patches/virt-host-validate-require-fuse-for-LXC-if-compiled-in.patch b/debian/patches/virt-host-validate-require-fuse-for-LXC-if-compiled-in.patch
new file mode 100644
index 0000000..6368062
--- /dev/null
+++ b/debian/patches/virt-host-validate-require-fuse-for-LXC-if-compiled-in.patch
@@ -0,0 +1,33 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 12 Oct 2017 16:51:13 +0200
+Subject: virt-host-validate: require fuse for LXC if compiled in
+
+Domains fail to start without fuse like
+
+  error: internal error: guest failed to start: fuse: device not found, try 'modprobe fuse' first
+  Failure in libvirt_lxc startup: no error
+
+so check for it too.
+
+References: https://ci.debian.net/data/autopkgtest/unstable/amd64/libv/libvirt/20171012_105903/log.gz
+---
+ tools/virt-host-validate-lxc.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c
+index 2b906cc..64d9279 100644
+--- a/tools/virt-host-validate-lxc.c
++++ b/tools/virt-host-validate-lxc.c
+@@ -93,5 +93,12 @@ int virHostValidateLXC(void)
+                                         "BLK_CGROUP") < 0)
+         ret = -1;
+ 
++#if WITH_FUSE
++    if (virHostValidateDeviceExists("LXC", "/sys/fs/fuse/connections",
++                                    VIR_HOST_VALIDATE_FAIL,
++                                    _("Load the 'fuse' module to enable /proc/ overrides")) < 0)
++        ret = -1;
++#endif
++
+     return ret;
+ }

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