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

Accepting request 749106 from home:yuanren10

Browse Source 
Update tmp sysconfig restore location

OBS-URL: https://build.opensuse.org/request/show/749106
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=164
This commit is contained in:
Yuan Ren 2019-11-17 07:55:58 +00:00 committed by Git OBS Bridge
parent 3b4a9d7d25
commit 76c3d6829f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
corosync.changes
View File

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

13
corosync.spec
View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
@ -260,7 +259,7 @@ APIs and libraries, default configuration files, and an init script.
# Upgrade # Upgrade
if [ $1 -eq 2 ]; then if [ $1 -eq 2 ]; then
# restore configured /etc/sysconfig/corosync(bsc#1155792) # restore configured /etc/sysconfig/corosync(bsc#1155792)
install -m 0644 %{_sysconfdir}/sysconfig/corosync /tmp/.sysconfig.corosync cp %{_sysconfdir}/sysconfig/corosync %{_fillupdir}/tmp.corosync_sysconfig
fi fi
%service_add_post corosync.service corosync-notifyd.service %service_add_post corosync.service corosync-notifyd.service
@ -279,7 +278,7 @@ fi
%posttrans %posttrans
if [ ! -f %{_sysconfdir}/sysconfig/corosync ]; then if [ ! -f %{_sysconfdir}/sysconfig/corosync ]; then
install -m 0644 /tmp/.sysconfig.corosync %{_sysconfdir}/sysconfig/corosync mv %{_fillupdir}/tmp.corosync_sysconfig %{_sysconfdir}/sysconfig/corosync
fi fi
%files %files
@ -584,7 +583,7 @@ NSS certificates and an init script.
%{fillup_only -n corosync-qdevice} %{fillup_only -n corosync-qdevice}
# Upgrade # Upgrade
if [ $1 -eq 2 ]; then if [ $1 -eq 2 ]; then
install -m 0644 %{_sysconfdir}/sysconfig/corosync-qdevice /tmp/.sysconfig.corosync-qdevice cp %{_sysconfdir}/sysconfig/corosync-qdevice %{_fillupdir}/tmp.corosync-qdevice_sysconfig
fi fi
%if %{sles_version} > 0 %if %{sles_version} > 0
@ -608,7 +607,7 @@ fi
%posttrans -n corosync-qdevice %posttrans -n corosync-qdevice
if [ ! -f %{_sysconfdir}/sysconfig/corosync-qdevice ]; then if [ ! -f %{_sysconfdir}/sysconfig/corosync-qdevice ]; then
install -m 0644 /tmp/.sysconfig.corosync-qdevice %{_sysconfdir}/sysconfig/corosync-qdevice mv %{_fillupdir}/tmp.corosync-qdevice_sysconfig %{_sysconfdir}/sysconfig/corosync-qdevice
fi fi
%files -n corosync-qdevice %files -n corosync-qdevice
@ -665,7 +664,7 @@ ln -s /run/corosync-qnetd /var/run/
%{fillup_only -n corosync-qnetd} %{fillup_only -n corosync-qnetd}
# Upgrade # Upgrade
if [ $1 -eq 2 ]; then if [ $1 -eq 2 ]; then
install -m 0644 %{_sysconfdir}/sysconfig/corosync-qnetd /tmp/.sysconfig.corosync-qnetd cp %{_sysconfdir}/sysconfig/corosync-qnetd %{_fillupdir}/tmp.corosync-qnetd_sysconfig
fi fi
%service_add_post corosync-qnetd.service %service_add_post corosync-qnetd.service
@ -686,7 +685,7 @@ fi
%posttrans -n corosync-qnetd %posttrans -n corosync-qnetd
if [ ! -f %{_sysconfdir}/sysconfig/corosync-qnetd ]; then if [ ! -f %{_sysconfdir}/sysconfig/corosync-qnetd ]; then
install -m 0644 /tmp/.sysconfig.corosync-qnetd %{_sysconfdir}/sysconfig/corosync-qnetd mv %{_fillupdir}/tmp.corosync-qnetd_sysconfig %{_sysconfdir}/sysconfig/corosync-qnetd
fi fi
%files -n corosync-qnetd %files -n corosync-qnetd