diff -Nru corosync-2.4.2/debian/changelog corosync-2.4.2/debian/changelog --- corosync-2.4.2/debian/changelog 2017-02-24 11:12:34.000000000 +0000 +++ corosync-2.4.2/debian/changelog 2018-01-31 00:40:31.000000000 +0000 @@ -1,3 +1,16 @@ +corosync (2.4.2-3ubuntu1) bionic; urgency=medium + + * Properly restart corosync and pacemaker together (LP: #1740892) + - d/rules: pass --restart-after-upgrade to dh_installinit + - d/control: indicate this version breaks all older pacemaker, to + force an upgrade of pacemaker. + - d/corosync.postinst: if flagged to do so by pacemaker, start + pacemaker on upgrade. + + This can be dropped after bionic releases as long as the other + changes are maintained. + + -- Nishanth Aravamudan Tue, 30 Jan 2018 16:40:31 -0800 + corosync (2.4.2-3build1) zesty; urgency=medium * No-change rebuild against libnspr4 diff -Nru corosync-2.4.2/debian/control corosync-2.4.2/debian/control --- corosync-2.4.2/debian/control 2016-12-18 19:11:35.000000000 +0000 +++ corosync-2.4.2/debian/control 2018-01-31 00:40:31.000000000 +0000 @@ -1,7 +1,8 @@ Source: corosync Section: admin Priority: optional -Maintainer: Debian HA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers Uploaders: Christoph Berg , Richard B Winters , Adrian Vondendriesch , @@ -39,6 +40,7 @@ lsb-base (>= 3.0-6), adduser, xsltproc +Breaks: pacemaker (<< 1.1.18~rc4-1ubuntu1) Description: cluster engine daemon and utilities ${DESCRIPTION} This package contains the Corosync daemon and some administration tools. diff -Nru corosync-2.4.2/debian/corosync.postinst corosync-2.4.2/debian/corosync.postinst --- corosync-2.4.2/debian/corosync.postinst 2016-12-18 19:11:35.000000000 +0000 +++ corosync-2.4.2/debian/corosync.postinst 2018-01-31 00:40:31.000000000 +0000 @@ -6,6 +6,16 @@ echo 'This file is here to keep the log dir around after package removal until #588515 is fixed.' >/var/log/corosync/.empty # really was empty before 2.3.5-1 + + # For upgrades from older corosync, look for a flag from + # pacemaker that it was running before upgrade. See LP: #1740892 + if dpkg --compare-versions "$2" lt "2.4.2-3ubuntu1"; then + if [ -f /run/pacemaker-was-running-lp1740892-workaround ]; then + if deb-systemd-invoke start pacemaker >/dev/null 2>&1; then + rm -f /run/pacemaker-was-running-lp1740892-workaround + fi + fi + fi fi #DEBHELPER# diff -Nru corosync-2.4.2/debian/rules corosync-2.4.2/debian/rules --- corosync-2.4.2/debian/rules 2016-12-19 08:47:04.000000000 +0000 +++ corosync-2.4.2/debian/rules 2018-01-31 00:40:31.000000000 +0000 @@ -79,6 +79,9 @@ override_dh_install: dh_install --fail-missing +override_dh_installinit: + dh_installinit --restart-after-upgrade + override_dh_installchangelogs: dh_installchangelogs ChangeLog