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

have systemd start socket units on iscsiadm use

Browse Source 
Resolves: #1003086

fixes use case of running iscsiadm right after rpm install without
having to manually start systemd units
This commit is contained in:
Chris Leech 2013-11-25 22:35:51 -08:00
parent a47be9a29b
commit e4192b1937
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0066-start-socket-listeners-on-iscsiadm-command.patch Normal file
View File

@ -0,0 +1,28 @@
From 89e9c2ff66d069b812fabcd4fefe453bbcea73e4 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com>
Date: Mon, 25 Nov 2013 22:28:12 -0800
Subject: [PATCH] start socket listeners on iscsiadm command
fix for trying to run iscsiadm commands right after installing the rpm
without manually starting the systemd units
---
etc/iscsid.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index 1fd3000..412f130 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
@@ -17,7 +17,8 @@
# maintainers.
#
# Default for Fedora and RHEL. (uncomment to activate).
-#iscsid.startup = /bin/systemctl start iscsid.service
+# Use socket activation, but try to make sure the socket units are listening
+iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
#
# Default for upstream open-iscsi scripts (uncomment to activate).
# iscsid.startup = /sbin/iscsid
--
1.8.3.1

3
iscsi-initiator-utils.spec
View File

@ -65,6 +65,7 @@ Patch62: 0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
Patch63: 0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
Patch64: 0064-libiscsi-fix-incorrect-strncpy-use.patch
Patch65: 0065-fix-hardened-build-of-iscsiuio.patch
Patch66: 0066-start-socket-listeners-on-iscsiadm-command.patch
# version string, needs to be updated with each build
Patch99: 0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
@ -146,6 +147,7 @@ developing applications that use %{name}.
%patch63 -p1
%patch64 -p1
%patch65 -p1
%patch66 -p1
# version string
%patch99 -p1
@ -297,6 +299,7 @@ fi
%changelog
* Mon Nov 25 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-16
- fix iscsiuio socket activation
- have systemd start socket units on iscsiadm use, if not already listening
* Sun Sep 15 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-15
- move /sbin to /usr/sbin