pool/corosync
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 747294 from network:ha-clustering:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/747294
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/corosync?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2019-11-13 12:13:42 +00:00 committed by Git OBS Bridge
commit 15371ae46f
2 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
corosync.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 7 06:26:20 UTC 2019 - Yuan Ren <yren@suse.com>
- Packaging bug updating Corosync(bsc#1155792)
Some noisy output from Tumbleweed caused by RPM macro not fairly used
Make sure corosync sysconfig keep original configured firstly(bsc1153502)
-------------------------------------------------------------------
Wed Oct 9 07:55:48 UTC 2019 - Yuan Ren <yren@suse.com>

59
corosync.spec
View File

@ -256,8 +256,13 @@ APIs and libraries, default configuration files, and an init script.
%post
/usr/lib/corosync/upgrade.sh
%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd
%{fillup_and_insserv -n corosync}
%{fillup_only -n corosync}
# Upgrade
if [ $1 -eq 2 ] ; then
# restore configured /etc/sysconfig/corosync(bsc#1155792)
install -m 0644 %{_sysconfdir}/sysconfig/corosync /tmp/.sysconfig.corosync
fi
%service_add_post corosync.service corosync-notifyd.service
rm -rf %{_sysconfdir}/corosync/corosync.conf.example %{_sysconfdir}/corosync/corosync.conf.example.unicast
@ -268,8 +273,13 @@ ln -s /usr/share/doc/packages/corosync/corosync.conf.example.udpu %{_sysconfdir}
%service_del_preun corosync.service corosync-notifyd.service
%postun
if [ -f /etc/sysconfig/corosync ]; then
rm /etc/sysconfig/corosync
if [ -f %{_sysconfdir}/sysconfig/corosync ]; then
rm %{_sysconfdir}/sysconfig/corosync
fi
%posttrans
if [ ! -f %{_sysconfdir}/sysconfig/corosync ] ; then
install -m 0644 /tmp/.sysconfig.corosync %{_sysconfdir}/sysconfig/corosync
fi
%files
@ -571,7 +581,12 @@ NSS certificates and an init script.
%service_add_pre corosync-qdevice.service
%post -n corosync-qdevice
%{fillup_and_insserv -n corosync-qdevice}
%{fillup_only -n corosync-qdevice}
# Upgrade
if [ $1 -eq 2 ] ; then
install -m 0644 %{_sysconfdir}/sysconfig/corosync-qdevice /tmp/.sysconfig.corosync-qdevice
fi
%if %{sles_version} > 0
ln -s /run/corosync-qdevice /var/run/
%endif
@ -584,12 +599,18 @@ ln -s /run/corosync-qdevice /var/run/
unlink /var/run/corosync-qdevice
%endif
%postun -n corosync-qdevice
if [ -f /etc/sysconfig/corosync-qdevice ]; then
rm /etc/sysconfig/corosync-qdevice
fi
%service_del_postun corosync-qdevice.service
%postun -n corosync-qdevice
if [ -f %{_sysconfdir}/sysconfig/corosync-qdevice ]; then
rm %{_sysconfdir}/sysconfig/corosync-qdevice
fi
%posttrans -n corosync-qdevice
if [ ! -f %{_sysconfdir}/sysconfig/corosync-qdevice ] ; then
install -m 0644 /tmp/.sysconfig.corosync-qdevice %{_sysconfdir}/sysconfig/corosync-qdevice
fi
%files -n corosync-qdevice
%defattr(-,root,root,-)
%dir %{_sysconfdir}/corosync/qdevice
@ -641,7 +662,11 @@ exit 0
%if %{sles_version} > 0
ln -s /run/corosync-qnetd /var/run/
%endif
%{fillup_and_insserv -n corosync-qnetd}
%{fillup_only -n corosync-qnetd}
# Upgrade
if [ $1 -eq 2 ] ; then
install -m 0644 %{_sysconfdir}/sysconfig/corosync-qnetd /tmp/.sysconfig.corosync-qnetd
fi
%service_add_post corosync-qnetd.service
@ -652,12 +677,18 @@ ln -s /run/corosync-qnetd /var/run/
unlink /var/run/corosync-qnetd
%endif
%postun -n corosync-qnetd
if [ -f /etc/sysconfig/corosync-qnetd ];then
rm /etc/sysconfig/corosync-qnetd
fi
%service_del_postun corosync-qnetd.service
%postun -n corosync-qnetd
if [ -f %{_sysconfdir}/sysconfig/corosync-qnetd ]; then
rm %{_sysconfdir}/sysconfig/corosync-qnetd
fi
%posttrans -n corosync-qnetd
if [ ! -f %{_sysconfdir}/sysconfig/corosync-qnetd ] ; then
install -m 0644 /tmp/.sysconfig.corosync-qnetd %{_sysconfdir}/sysconfig/corosync-qnetd
fi
%files -n corosync-qnetd
%defattr(-,root,root,-)
%dir %config(noreplace) %attr(750, coroqnetd, coroqnetd) %{_sysconfdir}/corosync/qnetd