From 60055d6619687705a248bf3ff0f7e09bf2da488c 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 1/7] add Provides/Replaces: corosync-pve
+Subject: [PATCH 1/8] add Provides/Replaces: corosync-pve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 34924c90ccb5cb883ac135b35e3ffdd48c459db7 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:32:02 +0100
-Subject: [PATCH 2/7] don't install default corosync.conf
+Subject: [PATCH 2/8] don't install default corosync.conf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From d962302d3a91eb614c6ecccf836b30032f1ae600 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:12:05 +0100
-Subject: [PATCH 3/7] restart after package upgrade is complete
+Subject: [PATCH 3/8] restart after package upgrade is complete
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 047ef59e56d1456283e2d4df68234e8b88f36a2d 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 4/7] remove init script
+Subject: [PATCH 4/8] remove init script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 519451819e81818c578ce177ad9cce859d9e55c2 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 5/7] add corosync-pve postinst for restart on dist-upgrade
+Subject: [PATCH 5/8] add corosync-pve postinst for restart on dist-upgrade
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 99fe4ea69637a29e7b089ba857cff61208fa0679 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 6/7] add libcorosync4-pve transitional package
+Subject: [PATCH 6/8] add libcorosync4-pve transitional package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 95e8f3ed850ddb1f42446c1d1a9582a7397c71d5 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 7/7] only start corosync.service if conf exists
+Subject: [PATCH 7/8] only start corosync.service if conf exists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--- /dev/null
+From f1b91ad6c1659477b72853666cde930932279d6c Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Wed, 29 Mar 2017 09:35:19 +0200
+Subject: [PATCH 8/8] remove unecessary and problematic corosync-qdevice.init
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ debian/corosync-qdevice.init | 55 --------------------------------------------
+ 1 file changed, 55 deletions(-)
+ delete mode 100755 debian/corosync-qdevice.init
+
+diff --git a/debian/corosync-qdevice.init b/debian/corosync-qdevice.init
+deleted file mode 100755
+index 344666a..0000000
+--- a/debian/corosync-qdevice.init
++++ /dev/null
+@@ -1,55 +0,0 @@
+-#!/bin/sh
+-# kFreeBSD do not accept scripts as interpreters, using #!/bin/sh and sourcing.
+-if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then
+- set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script
+-fi
+-### BEGIN INIT INFO
+-# Provides: corosync-qdevice
+-# Required-Start: $remote_fs $syslog corosync
+-# Required-Stop: $remote_fs $syslog corosync
+-# Default-Start:
+-# Default-Stop: 0 1 6
+-# Short-Description: Corosync Qdevice daemon
+-# Description: Starts and stops Corosync Qdevice daemon.
+-### END INIT INFO
+-
+-NAME="corosync-qdevice"
+-DESC="Corosync Qdevice daemon"
+-DAEMON="/usr/sbin/$NAME"
+-PIDFILE="/run/$NAME/$NAME.pid"
+-
+-CONFIG="/etc/default/$NAME"
+-[ -f "$CONFIG" ] && . "$CONFIG"
+-
+-DAEMON_ARGS="$COROSYNC_QDEVICE_OPTIONS"
+-
+-do_start_prepare() {
+- if grep -q nocluster /proc/cmdline; then
+- log_failure_msg "not configured to run at boot"
+- exit 1
+- fi
+-}
+-
+-# do_{start,stop}_cmd from init-d-script, but without the --name option.
+-# corosync-qdevice is too long for a process name, it gets truncated,
+-# which makes it incompatible with the --name option. See #843419.
+-do_start_cmd() {
+- start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE}} \
+- $START_ARGS \
+- --startas $DAEMON --exec $DAEMON --test > /dev/null \
+- || return 1
+- start-stop-daemon --start --quiet ${PIDFILE:+--pidfile ${PIDFILE}} \
+- $START_ARGS \
+- --startas $DAEMON --exec $DAEMON -- $DAEMON_ARGS \
+- || return 2
+-}
+-do_stop_cmd() {
+- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 \
+- $STOP_ARGS \
+- ${PIDFILE:+--pidfile ${PIDFILE}} --exec $DAEMON
+- RETVAL="$?"
+- [ "$RETVAL" = 2 ] && return 2
+- # Many daemons don't delete their pidfiles when they exit.
+- rm -f $PIDFILE
+- return $RETVAL
+-}
+--
+2.1.4
+
0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
0006-add-libcorosync4-pve-transitional-package.patch
0007-only-start-corosync.service-if-conf-exists.patch
+0008-remove-unecessary-and-problematic-corosync-qdevice.i.patch
projects / corosync-pve.git / commitdiff