]> git.proxmox.com Git - corosync-pve.git/blob - patches/0006-Revert-init-Enable-StopWhenUnneeded.patch
add patches for Corosync 3.x
[corosync-pve.git] / patches / 0006-Revert-init-Enable-StopWhenUnneeded.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
3 Date: Wed, 22 May 2019 12:25:28 +0200
4 Subject: [PATCH] Revert "init: Enable StopWhenUnneeded"
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 cherry-picked from upstream master
10
11 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
12 ---
13 .../Revert-init-Enable-StopWhenUnneeded.patch | 31 +++++++++++++++++++
14 debian/patches/series | 1 +
15 2 files changed, 32 insertions(+)
16 create mode 100644 debian/patches/Revert-init-Enable-StopWhenUnneeded.patch
17
18 diff --git a/debian/patches/Revert-init-Enable-StopWhenUnneeded.patch b/debian/patches/Revert-init-Enable-StopWhenUnneeded.patch
19 new file mode 100644
20 index 00000000..8b7f240c
21 --- /dev/null
22 +++ b/debian/patches/Revert-init-Enable-StopWhenUnneeded.patch
23 @@ -0,0 +1,31 @@
24 +From: Jan Friesse <jfriesse@redhat.com>
25 +Date: Thu, 4 Apr 2019 11:40:19 +0200
26 +Subject: Revert "init: Enable StopWhenUnneeded"
27 +
28 +This reverts commit 03d9321bc80887d4578744c26c05d61e2d9d4278.
29 +
30 +Reverted because when corosync service is not enabled and corosync
31 +is executed by "systemctl start corosync" it is then immediately
32 +shutdown because of "Unit not needed anymore. Stopping.".
33 +
34 +This is really not expected behavior.
35 +
36 +Signed-off-by: Jan Friesse <jfriesse@redhat.com>
37 +Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
38 +(cherry picked from commit 527e30a8d050c077d8adff2a5aa77d9b683a8f28)
39 +---
40 + init/corosync.service.in | 1 -
41 + 1 file changed, 1 deletion(-)
42 +
43 +diff --git a/init/corosync.service.in b/init/corosync.service.in
44 +index 28046ca..adf7080 100644
45 +--- a/init/corosync.service.in
46 ++++ b/init/corosync.service.in
47 +@@ -5,7 +5,6 @@ ConditionKernelCommandLine=!nocluster
48 + ConditionPathExists=/etc/corosync/corosync.conf
49 + Requires=network-online.target
50 + After=network-online.target
51 +-StopWhenUnneeded=yes
52 +
53 + [Service]
54 + EnvironmentFile=-@INITCONFIGDIR@/corosync
55 diff --git a/debian/patches/series b/debian/patches/series
56 index 32007175..2caabe1c 100644
57 --- a/debian/patches/series
58 +++ b/debian/patches/series
59 @@ -7,3 +7,4 @@ Use-the-SED-variable-provided-by-configure.patch
60 Use-the-AWK-variable-provided-by-configure.patch
61 pve__only-start-corosync.service-if-conf-exists.patch
62 cfgtool-Improve-link-status-display.patch
63 +Revert-init-Enable-StopWhenUnneeded.patch