import QEMU 5.0.0-rc2 and rebase patches

[pve-qemu.git] / debian / patches / pve / 0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch

diff --git a/debian/patches/pve/0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch b/debian/patches/pve/0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
index f3c098bbb9c16c2fb293917538b79cde95075298..c6e0f4c8fbbfc15d21e6a4958d53e603e2c7da60 100644 (file)
--- a/debian/patches/pve/0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
+++ b/debian/patches/pve/0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Mon, 24 Oct 2016 09:32:36 +0200
+Date: Mon, 6 Apr 2020 12:16:35 +0200
 Subject: [PATCH] PVE: [Config] glusterfs: no default logfile if daemonized
 
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
@@ -9,7 +9,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/block/gluster.c b/block/gluster.c
-index f64dc5b01e..061cab48c0 100644
+index 0aa1f2cda4..dcd1ef7ebc 100644
 --- a/block/gluster.c
 +++ b/block/gluster.c
 @@ -42,7 +42,7 @@