ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
GITVERSION:=$(shell git rev-parse HEAD)
-MAIN_DEB=corosync-pve_${CSVERSION}-${CSRELEASE}_all.deb
+MAIN_DEB=corosync_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
OTHER_DEBS=\
-libcorosync4-pve_${CSVERSION}-${CSRELEASE}_all.deb \
-corosync_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
corosync-notifyd_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
corosync-qdevice_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
corosync-qnetd_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
corosync-doc_${CSVERSION}-${CSRELEASE}_all.deb \
-corosync-dev_${CSVERSION}-${CSRELEASE}_all.deb \
libcfg6_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
libcmap4_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
libcorosync-common4_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Tue, 7 Mar 2017 13:29:31 +0100
-Subject: [PATCH] add Provides/Replaces: corosync-pve
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/control | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/debian/control b/debian/control
-index 8a0855ce..d5e2513a 100644
---- a/debian/control
-+++ b/debian/control
-@@ -43,6 +43,11 @@ X-Common-Description: The Corosync Cluster Engine is a Group Communication
- * A quorum system that notifies applications when quorum is achieved
- or lost.
-
-+Package: corosync-pve
-+Architecture: all
-+Depends: corosync (= ${binary:Version})
-+Description: Transitional package.
-+
- Package: corosync
- Architecture: any
- Pre-Depends:
-@@ -52,6 +57,8 @@ Depends: ${shlibs:Depends},
- lsb-base (>= 3.0-6),
- adduser,
- xsltproc
-+Provides: corosync-pve (= ${binary:Version})
-+Replaces: corosync-pve (<< 2.4.2-2)
- Description: cluster engine daemon and utilities
- ${S:X-Common-Description}
- .
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 22 May 2019 11:14:01 +0200
+Subject: [PATCH] don't install default corosync.conf
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ .../Make-the-example-config-valid.patch | 64 -------------------
+ debian/corosync.install | 2 +-
+ debian/patches/series | 1 -
+ debian/rules | 3 -
+ 4 files changed, 1 insertion(+), 69 deletions(-)
+ delete mode 100644 debian/patches/Make-the-example-config-valid.patch
+
+diff --git a/debian/patches/Make-the-example-config-valid.patch b/debian/patches/Make-the-example-config-valid.patch
+deleted file mode 100644
+index 5c2182f7..00000000
+--- a/debian/patches/Make-the-example-config-valid.patch
++++ /dev/null
+@@ -1,64 +0,0 @@
+-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
+-Date: Sun, 16 Dec 2018 22:51:46 +0100
+-Subject: Make the example config valid
+-
+----
+- conf/corosync.conf.example | 22 +++++++---------------
+- 1 file changed, 7 insertions(+), 15 deletions(-)
+-
+-diff --git a/conf/corosync.conf.example b/conf/corosync.conf.example
+-index 4658a86..91de572 100644
+---- a/conf/corosync.conf.example
+-+++ b/conf/corosync.conf.example
+-@@ -2,8 +2,10 @@
+- totem {
+- version: 2
+-
+-- # Set name of the cluster
+-- cluster_name: ExampleCluster
+-+ # Corosync itself works without a cluster name, but DLM needs one.
+-+ # The cluster name is also written into the VG metadata of newly
+-+ # created shared LVM volume groups, if lvmlockd uses DLM locking.
+-+ cluster_name: debian
+-
+- # crypto_cipher and crypto_hash: Used for mutual node authentication.
+- # If you choose to enable this, then do remember to create a shared
+-@@ -25,7 +27,7 @@ logging {
+- # Log to a log file. When set to "no", the "logfile" option
+- # must not be set.
+- to_logfile: yes
+-- logfile: /var/log/cluster/corosync.log
+-+ logfile: /var/log/corosync/corosync.log
+- # Log to the system log daemon. When in doubt, set to yes.
+- to_syslog: yes
+- # Log debug messages (very verbose). When in doubt, leave off.
+-@@ -41,7 +43,7 @@ logging {
+- quorum {
+- # Enable and configure quorum subsystem (default: off)
+- # see also corosync.conf.5 and votequorum.5
+-- #provider: corosync_votequorum
+-+ provider: corosync_votequorum
+- }
+-
+- nodelist {
+-@@ -53,19 +55,9 @@ nodelist {
+- # Cluster membership node identifier
+- nodeid: 1
+- # Address of first link
+-- #ring0_addr: 192.168.0.1
+-+ ring0_addr: 127.0.0.1
+- # When knet transport is used it's possible to define up to 8 links
+- #ring1_addr: 192.168.1.1
+- }
+-- node {
+-- # Hostname of the node
+-- name: node2
+-- # Cluster membership node identifier
+-- nodeid: 2
+-- # Address of first link
+-- #ring0_addr: 192.168.0.2
+-- # When knet transport is used it's possible to define up to 8 links
+-- #ring1_addr: 192.168.1.2
+-- }
+- # ...
+- }
+diff --git a/debian/corosync.install b/debian/corosync.install
+index bfaca759..c5b92661 100644
+--- a/debian/corosync.install
++++ b/debian/corosync.install
+@@ -25,7 +25,7 @@ usr/share/doc/corosync/AUTHORS
+ usr/share/doc/corosync/INSTALL
+ usr/share/augeas/lenses/corosync.aug
+ usr/share/augeas/lenses/tests/test_corosync.aug
+-etc/corosync/corosync.conf
++etc/corosync/corosync.*example* usr/share/doc/corosync/examples
+ etc/corosync/uidgid.d
+ usr/share/corosync/xml2conf.xsl
+ var/lib/corosync
+diff --git a/debian/patches/series b/debian/patches/series
+index 6b552ce1..41866b14 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -1,6 +1,5 @@
+ Fix-various-typos-in-ChangeLog.patch
+ Enable-PrivateTmp-in-the-systemd-service-files.patch
+-Make-the-example-config-valid.patch
+ corosync.conf.5-fix-grammar.patch
+ corosync.conf.5-typography-fixes.patch
+ AC_PROG_SED-is-already-present.patch
+diff --git a/debian/rules b/debian/rules
+index 52ff4699..50d89e2a 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -54,11 +54,8 @@ override_dh_auto_test-indep:
+ override_dh_auto_install-indep:
+ $(MAKE) -C man DESTDIR="$(CURDIR)/debian/tmp" install
+
+-CONF=debian/tmp/etc/corosync/corosync.conf
+ override_dh_auto_install-arch:
+ dh_auto_install
+-# We patched the example into a working config file:
+- mv -v $(CONF).example $(CONF)
+ rm -v debian/tmp/usr/lib/*/lib*.la
+ # we don't need the upstream license
+ rm debian/tmp/usr/share/doc/corosync/LICENSE
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 22 May 2019 11:14:01 +0200
-Subject: [PATCH] don't install default corosync.conf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- .../Make-the-example-config-valid.patch | 64 -------------------
- debian/corosync.install | 2 +-
- debian/patches/series | 1 -
- debian/rules | 3 -
- 4 files changed, 1 insertion(+), 69 deletions(-)
- delete mode 100644 debian/patches/Make-the-example-config-valid.patch
-
-diff --git a/debian/patches/Make-the-example-config-valid.patch b/debian/patches/Make-the-example-config-valid.patch
-deleted file mode 100644
-index 5c2182f7..00000000
---- a/debian/patches/Make-the-example-config-valid.patch
-+++ /dev/null
-@@ -1,64 +0,0 @@
--From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
--Date: Sun, 16 Dec 2018 22:51:46 +0100
--Subject: Make the example config valid
--
-----
-- conf/corosync.conf.example | 22 +++++++---------------
-- 1 file changed, 7 insertions(+), 15 deletions(-)
--
--diff --git a/conf/corosync.conf.example b/conf/corosync.conf.example
--index 4658a86..91de572 100644
----- a/conf/corosync.conf.example
--+++ b/conf/corosync.conf.example
--@@ -2,8 +2,10 @@
-- totem {
-- version: 2
--
--- # Set name of the cluster
--- cluster_name: ExampleCluster
--+ # Corosync itself works without a cluster name, but DLM needs one.
--+ # The cluster name is also written into the VG metadata of newly
--+ # created shared LVM volume groups, if lvmlockd uses DLM locking.
--+ cluster_name: debian
--
-- # crypto_cipher and crypto_hash: Used for mutual node authentication.
-- # If you choose to enable this, then do remember to create a shared
--@@ -25,7 +27,7 @@ logging {
-- # Log to a log file. When set to "no", the "logfile" option
-- # must not be set.
-- to_logfile: yes
--- logfile: /var/log/cluster/corosync.log
--+ logfile: /var/log/corosync/corosync.log
-- # Log to the system log daemon. When in doubt, set to yes.
-- to_syslog: yes
-- # Log debug messages (very verbose). When in doubt, leave off.
--@@ -41,7 +43,7 @@ logging {
-- quorum {
-- # Enable and configure quorum subsystem (default: off)
-- # see also corosync.conf.5 and votequorum.5
--- #provider: corosync_votequorum
--+ provider: corosync_votequorum
-- }
--
-- nodelist {
--@@ -53,19 +55,9 @@ nodelist {
-- # Cluster membership node identifier
-- nodeid: 1
-- # Address of first link
--- #ring0_addr: 192.168.0.1
--+ ring0_addr: 127.0.0.1
-- # When knet transport is used it's possible to define up to 8 links
-- #ring1_addr: 192.168.1.1
-- }
--- node {
--- # Hostname of the node
--- name: node2
--- # Cluster membership node identifier
--- nodeid: 2
--- # Address of first link
--- #ring0_addr: 192.168.0.2
--- # When knet transport is used it's possible to define up to 8 links
--- #ring1_addr: 192.168.1.2
--- }
-- # ...
-- }
-diff --git a/debian/corosync.install b/debian/corosync.install
-index bfaca759..c5b92661 100644
---- a/debian/corosync.install
-+++ b/debian/corosync.install
-@@ -25,7 +25,7 @@ usr/share/doc/corosync/AUTHORS
- usr/share/doc/corosync/INSTALL
- usr/share/augeas/lenses/corosync.aug
- usr/share/augeas/lenses/tests/test_corosync.aug
--etc/corosync/corosync.conf
-+etc/corosync/corosync.*example* usr/share/doc/corosync/examples
- etc/corosync/uidgid.d
- usr/share/corosync/xml2conf.xsl
- var/lib/corosync
-diff --git a/debian/patches/series b/debian/patches/series
-index 6b552ce1..41866b14 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -1,6 +1,5 @@
- Fix-various-typos-in-ChangeLog.patch
- Enable-PrivateTmp-in-the-systemd-service-files.patch
--Make-the-example-config-valid.patch
- corosync.conf.5-fix-grammar.patch
- corosync.conf.5-typography-fixes.patch
- AC_PROG_SED-is-already-present.patch
-diff --git a/debian/rules b/debian/rules
-index 52ff4699..50d89e2a 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -54,11 +54,8 @@ override_dh_auto_test-indep:
- override_dh_auto_install-indep:
- $(MAKE) -C man DESTDIR="$(CURDIR)/debian/tmp" install
-
--CONF=debian/tmp/etc/corosync/corosync.conf
- override_dh_auto_install-arch:
- dh_auto_install
--# We patched the example into a working config file:
-- mv -v $(CONF).example $(CONF)
- rm -v debian/tmp/usr/lib/*/lib*.la
- # we don't need the upstream license
- rm debian/tmp/usr/share/doc/corosync/LICENSE
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 8 Mar 2017 12:59:37 +0100
+Subject: [PATCH] remove init script
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ debian/corosync.init | 120 -------------------------------------------
+ 1 file changed, 120 deletions(-)
+ delete mode 100644 debian/corosync.init
+
+diff --git a/debian/corosync.init b/debian/corosync.init
+deleted file mode 100644
+index ff5ee9f7..00000000
+--- a/debian/corosync.init
++++ /dev/null
+@@ -1,120 +0,0 @@
+-#! /bin/sh
+-#
+-### BEGIN INIT INFO
+-# Provides: corosync
+-# Required-Start: $network $remote_fs $syslog
+-# Required-Stop: $network $remote_fs $syslog
+-# Default-Start: 2 3 4 5
+-# Default-Stop: 0 1 6
+-# Short-Description: corosync cluster framework
+-# Description: Manages the Corosync Cluster Engine.
+-### END INIT INFO
+-
+-# Author: Fabio M. Di Nitto <fabbione@ubuntu.com>
+-
+-# PATH should only include /usr/* if it runs after the mountnfs.sh script
+-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+-DESC="corosync daemon"
+-NAME=corosync
+-DAEMON=/usr/sbin/$NAME
+-OPTIONS=""
+-PIDFILE=/var/run/$NAME.pid
+-SCRIPTNAME=/etc/init.d/$NAME
+-PIDFILE=/var/run/corosync.pid
+-RARUNDIR=/var/run/resource-agents
+-
+-# Exit if the package is not installed
+-[ -x "$DAEMON" ] || exit 0
+-
+-# Read configuration variable file if it is present
+-[ -r /etc/default/corosync ] && . /etc/default/corosync
+-
+-# Make sure the Resource Agents run dir exists. Otherwise create it.
+-[ -d "$RARUNDIR" ] || mkdir -p $RARUNDIR
+-
+-# Define LSB log_* functions.
+-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+-. /lib/lsb/init-functions
+-
+-#
+-# Function that starts the daemon/service
+-#
+-do_start()
+-{
+- # Return
+- # 0 if daemon has been started
+- # 1 if daemon was already running
+- # 2 if daemon could not be started
+- start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
+- || return 1
+- start-stop-daemon --start --quiet --exec $DAEMON -- $OPTIONS \
+- || return 2
+- # Add code here, if necessary, that waits for the process to be ready
+- # to handle requests from services started subsequently which depend
+- # on this one. As a last resort, sleep for some time.
+- pidof corosync > $PIDFILE
+-}
+-
+-#
+-# Function that stops the daemon/service
+-#
+-do_stop()
+-{
+- # Return
+- # 0 if daemon has been stopped
+- # 1 if daemon was already stopped
+- # 2 if daemon could not be stopped
+- # other if a failure occurred
+- start-stop-daemon --stop --quiet --retry forever/QUIT/1 --pidfile $PIDFILE
+- RETVAL="$?"
+- [ "$RETVAL" = 2 ] && return 2
+- # Many daemons don't delete their pidfiles when they exit.
+- rm -f $PIDFILE
+- return "$RETVAL"
+-}
+-
+-case "$1" in
+- start)
+- log_daemon_msg "Starting $DESC" "$NAME"
+- do_start
+- case "$?" in
+- 0|1) log_end_msg 0 ;;
+- 2) log_end_msg 1 ;;
+- esac
+- ;;
+- stop)
+- log_daemon_msg "Stopping $DESC" "$NAME"
+- do_stop
+- case "$?" in
+- 0|1) log_end_msg 0 ;;
+- 2) log_end_msg 1 ;;
+- esac
+- ;;
+- restart|force-reload)
+- log_daemon_msg "Restarting $DESC" "$NAME"
+- do_stop
+- case "$?" in
+- 0|1)
+- do_start
+- case "$?" in
+- 0) log_end_msg 0 ;;
+- 1) log_end_msg 1 ;; # Old process is still running
+- *) log_end_msg 1 ;; # Failed to start
+- esac
+- ;;
+- *)
+- # Failed to stop
+- log_end_msg 1
+- ;;
+- esac
+- ;;
+- status|monitor)
+- status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
+- ;;
+- *)
+- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+- exit 3
+- ;;
+-esac
+-
+-:
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 24 Oct 2018 15:15:33 +0200
+Subject: [PATCH] only start corosync.service if conf exists
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ ...tart-corosync.service-if-conf-exists.patch | 24 +++++++++++++++++++
+ debian/patches/series | 1 +
+ 2 files changed, 25 insertions(+)
+ create mode 100644 debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
+
+diff --git a/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch b/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
+new file mode 100644
+index 00000000..edbc5eb0
+--- /dev/null
++++ b/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
+@@ -0,0 +1,24 @@
++From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
++Date: Mon, 13 Mar 2017 13:27:49 +0100
++Subject: only start corosync.service if conf exists
++MIME-Version: 1.0
++Content-Type: text/plain; charset="utf-8"
++Content-Transfer-Encoding: 8bit
++
++Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
++---
++ init/corosync.service.in | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/init/corosync.service.in b/init/corosync.service.in
++index dc99a4a..28046ca 100644
++--- a/init/corosync.service.in
+++++ b/init/corosync.service.in
++@@ -2,6 +2,7 @@
++ Description=Corosync Cluster Engine
++ Documentation=man:corosync man:corosync.conf man:corosync_overview
++ ConditionKernelCommandLine=!nocluster
+++ConditionPathExists=/etc/corosync/corosync.conf
++ Requires=network-online.target
++ After=network-online.target
++ StopWhenUnneeded=yes
+diff --git a/debian/patches/series b/debian/patches/series
+index 41866b14..fcba2944 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -5,3 +5,4 @@ corosync.conf.5-typography-fixes.patch
+ AC_PROG_SED-is-already-present.patch
+ Use-the-SED-variable-provided-by-configure.patch
+ Use-the-AWK-variable-provided-by-configure.patch
++pve__only-start-corosync.service-if-conf-exists.patch
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 8 Mar 2017 12:59:37 +0100
-Subject: [PATCH] remove init script
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/corosync.init | 120 -------------------------------------------
- 1 file changed, 120 deletions(-)
- delete mode 100644 debian/corosync.init
-
-diff --git a/debian/corosync.init b/debian/corosync.init
-deleted file mode 100644
-index ff5ee9f7..00000000
---- a/debian/corosync.init
-+++ /dev/null
-@@ -1,120 +0,0 @@
--#! /bin/sh
--#
--### BEGIN INIT INFO
--# Provides: corosync
--# Required-Start: $network $remote_fs $syslog
--# Required-Stop: $network $remote_fs $syslog
--# Default-Start: 2 3 4 5
--# Default-Stop: 0 1 6
--# Short-Description: corosync cluster framework
--# Description: Manages the Corosync Cluster Engine.
--### END INIT INFO
--
--# Author: Fabio M. Di Nitto <fabbione@ubuntu.com>
--
--# PATH should only include /usr/* if it runs after the mountnfs.sh script
--PATH=/usr/sbin:/usr/bin:/sbin:/bin
--DESC="corosync daemon"
--NAME=corosync
--DAEMON=/usr/sbin/$NAME
--OPTIONS=""
--PIDFILE=/var/run/$NAME.pid
--SCRIPTNAME=/etc/init.d/$NAME
--PIDFILE=/var/run/corosync.pid
--RARUNDIR=/var/run/resource-agents
--
--# Exit if the package is not installed
--[ -x "$DAEMON" ] || exit 0
--
--# Read configuration variable file if it is present
--[ -r /etc/default/corosync ] && . /etc/default/corosync
--
--# Make sure the Resource Agents run dir exists. Otherwise create it.
--[ -d "$RARUNDIR" ] || mkdir -p $RARUNDIR
--
--# Define LSB log_* functions.
--# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
--. /lib/lsb/init-functions
--
--#
--# Function that starts the daemon/service
--#
--do_start()
--{
-- # Return
-- # 0 if daemon has been started
-- # 1 if daemon was already running
-- # 2 if daemon could not be started
-- start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
-- || return 1
-- start-stop-daemon --start --quiet --exec $DAEMON -- $OPTIONS \
-- || return 2
-- # Add code here, if necessary, that waits for the process to be ready
-- # to handle requests from services started subsequently which depend
-- # on this one. As a last resort, sleep for some time.
-- pidof corosync > $PIDFILE
--}
--
--#
--# Function that stops the daemon/service
--#
--do_stop()
--{
-- # Return
-- # 0 if daemon has been stopped
-- # 1 if daemon was already stopped
-- # 2 if daemon could not be stopped
-- # other if a failure occurred
-- start-stop-daemon --stop --quiet --retry forever/QUIT/1 --pidfile $PIDFILE
-- RETVAL="$?"
-- [ "$RETVAL" = 2 ] && return 2
-- # Many daemons don't delete their pidfiles when they exit.
-- rm -f $PIDFILE
-- return "$RETVAL"
--}
--
--case "$1" in
-- start)
-- log_daemon_msg "Starting $DESC" "$NAME"
-- do_start
-- case "$?" in
-- 0|1) log_end_msg 0 ;;
-- 2) log_end_msg 1 ;;
-- esac
-- ;;
-- stop)
-- log_daemon_msg "Stopping $DESC" "$NAME"
-- do_stop
-- case "$?" in
-- 0|1) log_end_msg 0 ;;
-- 2) log_end_msg 1 ;;
-- esac
-- ;;
-- restart|force-reload)
-- log_daemon_msg "Restarting $DESC" "$NAME"
-- do_stop
-- case "$?" in
-- 0|1)
-- do_start
-- case "$?" in
-- 0) log_end_msg 0 ;;
-- 1) log_end_msg 1 ;; # Old process is still running
-- *) log_end_msg 1 ;; # Failed to start
-- esac
-- ;;
-- *)
-- # Failed to stop
-- log_end_msg 1
-- ;;
-- esac
-- ;;
-- status|monitor)
-- status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
-- ;;
-- *)
-- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-- exit 3
-- ;;
--esac
--
--:
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 8 Mar 2017 14:08:04 +0100
-Subject: [PATCH] add corosync-pve postinst for restart on dist-upgrade
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/corosync-pve.postinst | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
- create mode 100755 debian/corosync-pve.postinst
-
-diff --git a/debian/corosync-pve.postinst b/debian/corosync-pve.postinst
-new file mode 100755
-index 00000000..f282563f
---- /dev/null
-+++ b/debian/corosync-pve.postinst
-@@ -0,0 +1,12 @@
-+#!/bin/sh
-+
-+set -e
-+
-+if [ "$1" = "configure" ]; then
-+ if [ -n "$2" ]; then
-+ # switching package name from corosync-pve to corosync requires a manual restart on upgrade, once
-+ if dpkg --compare-versions "$2" lt "2.4.2-pve1" ; then
-+ deb-systemd-invoke try-restart corosync.service > /dev/null || true
-+ fi
-+ fi
-+fi
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Fri, 9 Nov 2018 13:24:18 +0100
+Subject: [PATCH] bsys: disable augeas-tools
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ debian/control | 1 -
+ debian/corosync.install | 2 --
+ debian/rules | 2 +-
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index 8a0855ce..717638e1 100644
+--- a/debian/control
++++ b/debian/control
+@@ -7,7 +7,6 @@ Uploaders:
+ Ferenc Wágner <wferi@debian.org>,
+ Standards-Version: 4.3.0
+ Build-Depends:
+- augeas-tools,
+ debhelper (>= 12~),
+ dctrl-tools,
+ groff,
+diff --git a/debian/corosync.install b/debian/corosync.install
+index c5b92661..dd3682b0 100644
+--- a/debian/corosync.install
++++ b/debian/corosync.install
+@@ -23,8 +23,6 @@ usr/share/man/man8/cmap_keys.8
+ usr/share/doc/corosync/README.recovery
+ usr/share/doc/corosync/AUTHORS
+ usr/share/doc/corosync/INSTALL
+-usr/share/augeas/lenses/corosync.aug
+-usr/share/augeas/lenses/tests/test_corosync.aug
+ etc/corosync/corosync.*example* usr/share/doc/corosync/examples
+ etc/corosync/uidgid.d
+ usr/share/corosync/xml2conf.xsl
+diff --git a/debian/rules b/debian/rules
+index 50d89e2a..ee051926 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -37,7 +37,7 @@ override_dh_auto_configure:
+ --enable-dbus \
+ $(enable-monitoring) \
+ $(enable-watchdog) \
+- --enable-augeas \
++ --disable-augeas \
+ --enable-snmp \
+ --enable-xmlconf \
+ $(enable-systemd) \
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Mon, 13 Mar 2017 13:26:29 +0100
-Subject: [PATCH] add libcorosync4-pve transitional package
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/control | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/debian/control b/debian/control
-index d5e2513a..7643c79e 100644
---- a/debian/control
-+++ b/debian/control
-@@ -48,6 +48,11 @@ Architecture: all
- Depends: corosync (= ${binary:Version})
- Description: Transitional package.
-
-+Package: libcorosync4-pve
-+Architecture: all
-+Depends: corosync (= ${binary:Version})
-+Description: Transitional package.
-+
- Package: corosync
- Architecture: any
- Pre-Depends:
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 24 Oct 2018 15:15:33 +0200
-Subject: [PATCH] only start corosync.service if conf exists
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- ...tart-corosync.service-if-conf-exists.patch | 28 +++++++++++++++++++
- debian/patches/series | 1 +
- 2 files changed, 29 insertions(+)
- create mode 100644 debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
-
-diff --git a/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch b/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
-new file mode 100644
-index 00000000..18afb84e
---- /dev/null
-+++ b/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
-@@ -0,0 +1,28 @@
-+From 306692e2627b0fe072bfae21ddb5d501189c57c5 Mon Sep 17 00:00:00 2001
-+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-+Date: Mon, 13 Mar 2017 13:27:49 +0100
-+Subject: [PATCH] only start corosync.service if conf exists
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
-+---
-+ init/corosync.service.in | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+diff --git a/init/corosync.service.in b/init/corosync.service.in
-+index 7733a98c..1b65c94b 100644
-+--- a/init/corosync.service.in
-++++ b/init/corosync.service.in
-+@@ -2,6 +2,7 @@
-+ Description=Corosync Cluster Engine
-+ Documentation=man:corosync man:corosync.conf man:corosync_overview
-+ ConditionKernelCommandLine=!nocluster
-++ConditionPathExists=/etc/corosync/corosync.conf
-+ Requires=network-online.target
-+ After=network-online.target
-+
-+--
-+2.19.1
-+
-diff --git a/debian/patches/series b/debian/patches/series
-index 41866b14..fcba2944 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -5,3 +5,4 @@ corosync.conf.5-typography-fixes.patch
- AC_PROG_SED-is-already-present.patch
- Use-the-SED-variable-provided-by-configure.patch
- Use-the-AWK-variable-provided-by-configure.patch
-+pve__only-start-corosync.service-if-conf-exists.patch
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Fri, 9 Nov 2018 13:24:18 +0100
-Subject: [PATCH] bsys: disable augeas-tools
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/control | 1 -
- debian/corosync.install | 2 --
- debian/rules | 2 +-
- 3 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/debian/control b/debian/control
-index 7643c79e..c3e1608b 100644
---- a/debian/control
-+++ b/debian/control
-@@ -7,7 +7,6 @@ Uploaders:
- Ferenc Wágner <wferi@debian.org>,
- Standards-Version: 4.3.0
- Build-Depends:
-- augeas-tools,
- debhelper (>= 12~),
- dctrl-tools,
- groff,
-diff --git a/debian/corosync.install b/debian/corosync.install
-index c5b92661..dd3682b0 100644
---- a/debian/corosync.install
-+++ b/debian/corosync.install
-@@ -23,8 +23,6 @@ usr/share/man/man8/cmap_keys.8
- usr/share/doc/corosync/README.recovery
- usr/share/doc/corosync/AUTHORS
- usr/share/doc/corosync/INSTALL
--usr/share/augeas/lenses/corosync.aug
--usr/share/augeas/lenses/tests/test_corosync.aug
- etc/corosync/corosync.*example* usr/share/doc/corosync/examples
- etc/corosync/uidgid.d
- usr/share/corosync/xml2conf.xsl
-diff --git a/debian/rules b/debian/rules
-index 50d89e2a..ee051926 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -37,7 +37,7 @@ override_dh_auto_configure:
- --enable-dbus \
- $(enable-monitoring) \
- $(enable-watchdog) \
-- --enable-augeas \
-+ --disable-augeas \
- --enable-snmp \
- --enable-xmlconf \
- $(enable-systemd) \
-0001-add-Provides-Replaces-corosync-pve.patch
-0002-don-t-install-default-corosync.conf.patch
-0003-remove-init-script.patch
-0004-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
-0005-add-libcorosync4-pve-transitional-package.patch
-0006-only-start-corosync.service-if-conf-exists.patch
-0007-bsys-disable-augeas-tools.patch
+0001-don-t-install-default-corosync.conf.patch
+0002-remove-init-script.patch
+0003-only-start-corosync.service-if-conf-exists.patch
+0004-bsys-disable-augeas-tools.patch
projects / corosync-pve.git / commitdiff