Accepting request 1071087 from home:nicholasyang:branches:network:ha-clustering:Factory
replace %pretrans with %pre since zypper handles file conflicts zypper adds `--force` argument to `rpm -U` so that %pretrans is not needed. OBS-URL: https://build.opensuse.org/request/show/1071087 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=123
This commit is contained in:
parent
4b16010b05
commit
c3637fdf63
@ -147,7 +147,8 @@ rm -rf %{buildroot}%{libdir}/drbd/crm-*fence-peer.sh # bsc#1204276
|
||||
ln -sf %{libdir}/drbd %{buildroot}/lib/drbd
|
||||
%endif
|
||||
|
||||
%pretrans
|
||||
%pre
|
||||
%service_add_pre %{services}
|
||||
%if 0%{?suse_version} < 1550
|
||||
if [ ! -L /lib/drbd ] && [ -d /lib/drbd ]; then
|
||||
rm -rf /lib/drbd.rpmmoved
|
||||
@ -155,9 +156,6 @@ if [ ! -L /lib/drbd ] && [ -d /lib/drbd ]; then
|
||||
fi
|
||||
%endif
|
||||
|
||||
%pre
|
||||
%service_add_pre %{services}
|
||||
|
||||
%post
|
||||
%tmpfiles_create %{_tmpfilesdir}/drbd.conf
|
||||
%service_add_post %{services}
|
||||
|
Loading…
Reference in New Issue
Block a user