bump version to 2.6.2-2

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

From 577243992461100d840e90b6018df958ee165a34 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/55] glusterfs: daemonize

---
 block/gluster.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/block/gluster.c b/block/gluster.c
index a8aaacf..9cf33e9 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -198,9 +198,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