adding 2.5 pve patches and left-over extra fixes

[pve-qemu-kvm.git] / debian / patches / pve / 0026-glusterfs-daemonize.patch

diff --git a/debian/patches/pve/0026-glusterfs-daemonize.patch b/debian/patches/pve/0026-glusterfs-daemonize.patch
new file mode 100644 (file)
index 0000000..c7c212d
--- /dev/null
+++ b/debian/patches/pve/0026-glusterfs-daemonize.patch
@@ -0,0 +1,31 @@
+From 34ccb14434cfc6b61e568aa076bc09231df45981 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Wed, 9 Dec 2015 16:33:10 +0100
+Subject: [PATCH 26/41] glusterfs: daemonize
+
+---
+ block/gluster.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/block/gluster.c b/block/gluster.c
+index 0857c14..e3c0dbc 100644
+--- a/block/gluster.c
++++ b/block/gluster.c
+@@ -196,9 +196,11 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename,
+      * TODO: Use GF_LOG_ERROR instead of hard code value of 4 here when
+      * GlusterFS makes GF_LOG_* macros available to libgfapi users.
+      */
+-    ret = glfs_set_logging(glfs, "-", 4);
+-    if (ret < 0) {
+-        goto out;
++    if (!is_daemonized()) {
++        ret = glfs_set_logging(glfs, "-", 4);
++        if (ret < 0) {
++            goto out;
++        }
+     }
+ 
+     ret = glfs_init(glfs);
+-- 
+2.1.4
+