Hello community,
here is the log from the commit of package corosync for openSUSE:Factory
checked in at 2018-03-12 12:07:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/corosync (Old)
and /work/SRC/openSUSE:Factory/.corosync.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "corosync"
Mon Mar 12 12:07:41 2018 rev:55 rq:584184 version:2.4.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2018-03-07
10:30:37.011267111 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes 2018-03-12
12:07:42.900070524 +0100
@@ -1,0 +2,6 @@
+Thu Mar 8 06:19:09 UTC 2018 - b...@suse.com
+
+- [Build 489.1] Corosync is not working after upgrade from sle11sp4-ha to
sle15-ha(bsc#1083561)
+ Added: 0016-bsc#1083561-upgrade-from-1-x-y.patch
+
+-------------------------------------------------------------------
New:
----
0016-bsc#1083561-upgrade-from-1-x-y.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ corosync.spec ++++++
--- /var/tmp/diff_new_pack.DAdpOL/_old 2018-03-12 12:07:45.431979772 +0100
+++ /var/tmp/diff_new_pack.DAdpOL/_new 2018-03-12 12:07:45.435979629 +0100
@@ -77,6 +77,7 @@
Patch20: 0013-logging-Make-blackbox-configurable.patch
Patch21: 0014-logging-Close-before-and-open-blackbox-after-fork.patch
Patch22: 0015-coverity-fixes.patch
+Patch23: 0016-bsc#1083561-upgrade-from-1-x-y.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# openais is indeed gone and should be uninstalled. Yes, we do not
@@ -164,6 +165,7 @@
%patch20 -p1
%patch21 -p1
%patch22 -p1
+%patch23 -p1
%build
%if %{with runautogen}
@@ -245,6 +247,8 @@
mkdir -p %{buildroot}%{_sysconfdir}/init.d/
install -m 0644 tools/corosync-notifyd.sysconfig.example
%{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
install -m 0644 conf/corosync.conf.example*
%{buildroot}/usr/share/doc/packages/corosync/
+mkdir -p %{buildroot}/usr/lib/corosync
+install -m 0755 init/upgrade.sh %{buildroot}/usr/lib/corosync
rm -rf %{buildroot}/etc/corosync/corosync.conf.example*
rm -rf %{buildroot}/etc/logrotate.d/
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
@@ -280,6 +284,7 @@
%service_add_pre corosync.service corosync-notifyd.service
%post
+/usr/lib/corosync/upgrade.sh
%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd
%{fillup_and_insserv -n corosync}
%service_add_post corosync.service corosync-notifyd.service
@@ -322,6 +327,8 @@
%dir %{_sysconfdir}/corosync
%dir %{_sysconfdir}/corosync/uidgid.d
%dir %{_datadir}/doc/corosync/
+%dir /usr/lib/corosync/
+/usr/lib/corosync/upgrade.sh
%config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example
%config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example.udpu
%config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd
++++++ 0016-bsc#1083561-upgrade-from-1-x-y.patch ++++++
>From 374895340ebaa41bee26a2c2272bc9e3906ede22 Mon Sep 17 00:00:00 2001
From: Bin Liu <b...@suse.com>
Date: Thu, 8 Mar 2018 13:34:54 +0800
Subject: [PATCH] add init-upgrade.patch
---
init/upgrade.sh | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 init/upgrade.sh
diff --git a/init/upgrade.sh b/init/upgrade.sh
new file mode 100644
index 00000000..774aece9
--- /dev/null
+++ b/init/upgrade.sh
@@ -0,0 +1,18 @@
+#! /bin/bash
+CONFIG_FILE=/etc/corosync/corosync.conf
+CONFIG_FILE_OLD=/etc/corosync/corosync.conf.old
+
+if [ -f $CONFIG_FILE ]; then
+ cp $CONFIG_FILE $CONFIG_FILE_OLD
+ #lots of operations
+ sed -i "/amf\ *{/,/\ *}/d" $CONFIG_FILE && \
+ sed -i "/aisexec\ *{/,/\ *}/d" $CONFIG_FILE && \
+ sed -i "/service\ *{/,/\ *}/d" $CONFIG_FILE && \
+ #sed -i "/token:/,/max_messages:/d" $CONFIG_FILE && \
+ sed -i "s/AMF/QUORUM/g" $CONFIG_FILE
+ if [ $? -ne 0 ]; then
+ cp $CONFIG_FILE_OLD $CONFIG_FILE
+ else
+ rm $CONFIG_FILE_OLD
+ fi
+fi
--
2.13.6
