Resolves: #1180100
scriptlets were never split out properly for the iscsiuio subpackage
This commit is contained in:
parent
705c811a7c
commit
6ac03dbfba
@ -16,7 +16,7 @@ index a090522..aef0c3d 100644
|
|||||||
* some other maintainer could merge a patch without going through us
|
* some other maintainer could merge a patch without going through us
|
||||||
*/
|
*/
|
||||||
-#define ISCSI_VERSION_STR "2.0-873"
|
-#define ISCSI_VERSION_STR "2.0-873"
|
||||||
+#define ISCSI_VERSION_STR "6.2.0.873-27"
|
+#define ISCSI_VERSION_STR "6.2.0.873-28"
|
||||||
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
|
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
Summary: iSCSI daemon and utility programs
|
Summary: iSCSI daemon and utility programs
|
||||||
Name: iscsi-initiator-utils
|
Name: iscsi-initiator-utils
|
||||||
Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
|
Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
|
||||||
Release: 27%{?dist}
|
Release: 28%{?dist}
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.open-iscsi.org
|
URL: http://www.open-iscsi.org
|
||||||
@ -356,7 +356,7 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
|
|||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
%systemd_post iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
|
%systemd_post iscsi.service iscsi-shutdown.service iscsid.service iscsid.socket
|
||||||
|
|
||||||
if [ $1 -eq 1 ]; then
|
if [ $1 -eq 1 ]; then
|
||||||
if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ]; then
|
if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ]; then
|
||||||
@ -365,16 +365,28 @@ if [ $1 -eq 1 ]; then
|
|||||||
# enable socket activation and persistant session startup by default
|
# enable socket activation and persistant session startup by default
|
||||||
/bin/systemctl enable iscsi.service >/dev/null 2>&1 || :
|
/bin/systemctl enable iscsi.service >/dev/null 2>&1 || :
|
||||||
/bin/systemctl enable iscsid.socket >/dev/null 2>&1 || :
|
/bin/systemctl enable iscsid.socket >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post iscsiuio
|
||||||
|
%systemd_post iscsiuio.service iscsiuio.socket
|
||||||
|
|
||||||
|
if [ $1 -eq 1 ]; then
|
||||||
/bin/systemctl enable iscsiuio.socket >/dev/null 2>&1 || :
|
/bin/systemctl enable iscsiuio.socket >/dev/null 2>&1 || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%systemd_preun iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
|
%systemd_preun iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
|
||||||
|
|
||||||
|
%preun iscsiuio
|
||||||
|
%systemd_preun iscsiuio.service iscsiuio.socket
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
%systemd_postun
|
%systemd_postun
|
||||||
|
|
||||||
|
%postun iscsiuio
|
||||||
|
%systemd_postun
|
||||||
|
|
||||||
%triggerun -- iscsi-initiator-utils < 6.2.0.873-1
|
%triggerun -- iscsi-initiator-utils < 6.2.0.873-1
|
||||||
# Save the current service runlevel info
|
# Save the current service runlevel info
|
||||||
# User must manually run systemd-sysv-convert --apply iscsid
|
# User must manually run systemd-sysv-convert --apply iscsid
|
||||||
@ -393,6 +405,10 @@ fi
|
|||||||
/bin/systemctl try-restart iscsid.service >/dev/null 2>&1 || :
|
/bin/systemctl try-restart iscsid.service >/dev/null 2>&1 || :
|
||||||
/bin/systemctl try-restart iscsi.service >/dev/null 1>&1 || :
|
/bin/systemctl try-restart iscsi.service >/dev/null 1>&1 || :
|
||||||
|
|
||||||
|
%triggerun iscsiuio -- iscsi-initiator-utils < 6.2.0.873-1
|
||||||
|
# enable socket activation
|
||||||
|
/bin/systemctl enable iscsiuio.socket >/dev/null 2>&1 || :
|
||||||
|
|
||||||
%triggerun -- iscsi-initiator-utils < 6.2.0.873-22
|
%triggerun -- iscsi-initiator-utils < 6.2.0.873-22
|
||||||
# prior to 6.2.0.873-22 iscsi.service was missing a Wants=remote-fs-pre.target
|
# prior to 6.2.0.873-22 iscsi.service was missing a Wants=remote-fs-pre.target
|
||||||
# this forces remote-fs-pre.target active if needed for a clean shutdown/reboot
|
# this forces remote-fs-pre.target active if needed for a clean shutdown/reboot
|
||||||
@ -463,6 +479,9 @@ fi
|
|||||||
%{_includedir}/libiscsi.h
|
%{_includedir}/libiscsi.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 15 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-28
|
||||||
|
- 1180100 scriptlets were never split out properly for the iscsiuio subpackage
|
||||||
|
|
||||||
* Thu Jan 15 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-27
|
* Thu Jan 15 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-27
|
||||||
- 1168556 fix regression in network interface binding
|
- 1168556 fix regression in network interface binding
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user