rpms/iscsi-initiator-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: #1180100

Browse Source 
scriptlets were never split out properly for the iscsiuio subpackage
This commit is contained in:
Chris Leech 2015-01-15 21:19:27 -08:00
parent 705c811a7c
commit 6ac03dbfba
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
View File

@ -16,7 +16,7 @@ index a090522..aef0c3d 100644
* some other maintainer could merge a patch without going through us
*/
-#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"
#endif

23
iscsi-initiator-utils.spec
View File

@ -4,7 +4,7 @@
Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils
Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
Release: 27%{?dist}
Release: 28%{?dist}
Group: System Environment/Daemons
License: GPLv2+
URL: http://www.open-iscsi.org
@ -356,7 +356,7 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
%post
/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 [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ]; then
@ -365,16 +365,28 @@ if [ $1 -eq 1 ]; then
# enable socket activation and persistant session startup by default
/bin/systemctl enable iscsi.service >/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 || :
fi
%preun
%systemd_preun iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
%preun iscsiuio
%systemd_preun iscsiuio.service iscsiuio.socket
%postun
/sbin/ldconfig
%systemd_postun
%postun iscsiuio
%systemd_postun
%triggerun -- iscsi-initiator-utils < 6.2.0.873-1
# Save the current service runlevel info
# 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 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
# 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
@ -463,6 +479,9 @@ fi
%{_includedir}/libiscsi.h
%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
- 1168556 fix regression in network interface binding