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

Accepting request 794271 from home:lee_duncan:branches:network

Browse Source 
- Updated service_del_preun and service_del_postun for iscsi and
  iscsiuio packges in SPEC file, so that services get started/
  stopped in the correct order, and changed systemd macros so
  that iscsi login service iscsi.service is not restarted during
  package upgrade (bsc#1166650)

OBS-URL: https://build.opensuse.org/request/show/794271
OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=161
This commit is contained in:
Lee Duncan 2020-04-15 17:52:58 +00:00 committed by Git OBS Bridge
parent e7442797d5
commit 8032cef0aa
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
open-iscsi.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Apr 7 19:21:38 UTC 2020 - Lee Duncan <lduncan@suse.com>
- Updated service_del_preun and service_del_postun for iscsi and
iscsiuio packges in SPEC file, so that services get started/
stopped in the correct order, and changed systemd macros so
that iscsi login service iscsi.service is not restarted during
package upgrade (bsc#1166650)
-------------------------------------------------------------------
Wed Apr 1 18:38:30 UTC 2020 - Lee Duncan <lduncan@suse.com>

17
open-iscsi.spec
View File

@ -143,34 +143,35 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir}
if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ] ; then
/sbin/iscsi-gen-initiatorname
fi
%{service_add_post iscsid.socket iscsid.service iscsi.service}
%service_add_post iscsi.service iscsid.service iscsid.socket
%posttrans
%{?regenerate_initrd_posttrans}
%postun
%{service_del_postun iscsid.socket iscsid.service iscsi.service}
%service_del_postun_without_restart iscsi.service
%service_del_postun iscsid.service iscsid.socket
%pre
%{service_add_pre iscsid.socket iscsid.service iscsi.service}
%service_add_pre iscsi.service iscsid.service iscsid.socket
%preun
%{service_del_preun iscsid.socket iscsid.service iscsi.service}
%service_del_preun iscsi.service iscsid.service iscsid.socket
%post -n libopeniscsiusr0_2_0 -p /sbin/ldconfig
%postun -n libopeniscsiusr0_2_0 -p /sbin/ldconfig
%post -n iscsiuio
%{service_add_post iscsiuio.socket iscsiuio.service}
%service_add_post iscsiuio.service iscsiuio.socket
%postun -n iscsiuio
%{service_del_postun iscsiuio.socket iscsiuio.service}
%service_del_postun iscsiuio.service iscsiuio.socket
%pre -n iscsiuio
%{service_add_pre iscsiuio.socket iscsiuio.service}
%service_add_pre iscsiuio.service iscsiuio.socket
%preun -n iscsiuio
%{service_del_preun iscsiuio.socket iscsiuio.service}
%service_del_preun iscsiuio.service iscsiuio.socket
%files
%dir %{_sysconfdir}/iscsi