From be7c70a9829c09f27e6f82903f32912594de7e2a9af3b581de5861c5e64d93f4 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Thu, 14 Jul 2016 08:06:36 +0000 Subject: [PATCH] Accepting request 408417 from home:BinLiu:branches:network:ha-clustering:Factory - corosync process still exists when stop pacemaker service(bnc#988683) OBS-URL: https://build.opensuse.org/request/show/408417 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=69 --- corosync.changes | 4 ++++ corosync.spec | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/corosync.changes b/corosync.changes index d42c707..bb91a26 100644 --- a/corosync.changes +++ b/corosync.changes @@ -1,3 +1,7 @@ +------------------------------------------------------------------- +Thu Jul 14 07:59:03 UTC 2016 - bliu@suse.com +- corosync process still exists when stop pacemaker service(bnc#988683) + ------------------------------------------------------------------- Mon Aug 17 15:09:13 UTC 2015 - bliu@suse.com(bnc#941910) - remove git files from tarball diff --git a/corosync.spec b/corosync.spec index ce3d3cb..141a420 100644 --- a/corosync.spec +++ b/corosync.spec @@ -1,7 +1,7 @@ # # spec file for package corosync # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ %bcond_with runautogen %define with_runautogen 1 -%if 0%{?sles_version} == 11 +%if 0%{?sles_version} == 12 %ifnarch s390 s390x %define buildib 1 %endif @@ -207,10 +207,6 @@ APIs and libraries, default configuration files, and an init script. %post %if %{with systemd} && 0%{?systemd_post:1} %service_add_post corosync.service corosync-notifyd.service -%else -if [ $1 -eq 1 ]; then - /sbin/chkconfig --add corosync || : -fi %endif rm -rf %{_sysconfdir}/corosync/corosync.conf.example %{_sysconfdir}/corosync/corosync.conf.example.unicast ln -s /usr/share/doc/packages/corosync/corosync.conf.example %{_sysconfdir}/corosync/