From db645044f59ac29480a849d9958af9caa196f8a9 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 24 Oct 2016 09:33:39 +0200 Subject: [PATCH] Fix #1178: bring back glusterfs-daemonize patch --- debian/patches/pve/0044-glusterfs-daemonize.patch | 31 +++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 32 insertions(+) create mode 100644 debian/patches/pve/0044-glusterfs-daemonize.patch diff --git a/debian/patches/pve/0044-glusterfs-daemonize.patch b/debian/patches/pve/0044-glusterfs-daemonize.patch new file mode 100644 index 0000000..a19fca7 --- /dev/null +++ b/debian/patches/pve/0044-glusterfs-daemonize.patch @@ -0,0 +1,31 @@ +From f9f68037d7138efd078dba7c23c4c9066c5ddacc Mon Sep 17 00:00:00 2001 +From: Wolfgang Bumiller +Date: Mon, 24 Oct 2016 09:32:36 +0200 +Subject: [PATCH 44/44] glusterfs: daemonize + +--- + block/gluster.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/block/gluster.c b/block/gluster.c +index 01b479f..6dcf926 100644 +--- a/block/gluster.c ++++ b/block/gluster.c +@@ -341,9 +341,11 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, + } + } + +- ret = glfs_set_logging(glfs, "-", gconf->debug_level); +- if (ret < 0) { +- goto out; ++ if (!is_daemonized()) { ++ ret = glfs_set_logging(glfs, "-", gconf->debug_level); ++ if (ret < 0) { ++ goto out; ++ } + } + + ret = glfs_init(glfs); +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index 2821c4c..d025009 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,6 +41,7 @@ pve/0040-enable-cache-unsafe-for-vma-extract_content-and-qmp_.patch pve/0041-savevm-async-updates.patch pve/0042-qmp_snapshot_drive-add-aiocontext.patch pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch +pve/0044-glusterfs-daemonize.patch #see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all extra/x86-lapic-Load-LAPIC-state-at-post_load.patch extra/0001-Revert-target-i386-disable-LINT0-after-reset.patch -- 2.11.4.GIT