diff --git a/0066-start-socket-listeners-on-iscsiadm-command.patch b/0066-start-socket-listeners-on-iscsiadm-command.patch new file mode 100644 index 0000000..cb363b7 --- /dev/null +++ b/0066-start-socket-listeners-on-iscsiadm-command.patch @@ -0,0 +1,28 @@ +From 89e9c2ff66d069b812fabcd4fefe453bbcea73e4 Mon Sep 17 00:00:00 2001 +From: Chris Leech +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 + diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 4c925e4..00dc729 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -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 - 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 - 6.2.0.873-15 - move /sbin to /usr/sbin