From 658ff4f3ffa04bf94152fd598dd1456463bb4e13 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Feb 07 2012 03:33:18 +0000
Subject: fix iscsi/iscsid service start


The delayed iscsi/iscsid service start is causing too many problems.
This reverts the behavior to where when start is requested we always
start.

In the future maybe we can make the iscsid service just be used for
root on iscsi. Then for other iscsi uses we would just have the iscsi
service with iscsiadm starting iscsid and loading modules as needed.
We can begin coverting dependent services and anaconda in the next
version of fedora.

---

diff --git a/iscsi-initiator-utils-add-rh-ver.patch b/iscsi-initiator-utils-add-rh-ver.patch
index 2b5d01c..18c1b64 100644
--- a/iscsi-initiator-utils-add-rh-ver.patch
+++ b/iscsi-initiator-utils-add-rh-ver.patch
@@ -5,7 +5,7 @@
   * some other maintainer could merge a patch without going through us
   */
 -#define ISCSI_VERSION_STR	"2.0-872"
-+#define ISCSI_VERSION_STR	"2.0-872.15.f17"
++#define ISCSI_VERSION_STR	"2.0-872.17.f17"
  #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
  
  #endif
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 6c7d266..dcbdeda 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.872
-Release: 16%{?dist}
+Release: 17%{?dist}
 Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -229,6 +229,10 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Mon Feb 5 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.17
+- 786174 Change iscsid/iscsi service startup, so it always starts
+  when called.
+
 * Sat Feb 4 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.16
 - 747479 Fix iscsidevs handling of network requirement
 
diff --git a/iscsid.init b/iscsid.init
index c208ccc..92912f2 100755
--- a/iscsid.init
+++ b/iscsid.init
@@ -74,15 +74,8 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
 
-    # only start if nodes are setup to startup automatically, root is iscsi,
-    # or if iscsid is managing the sessions.
-    grep -qrs "node.startup = automatic" /var/lib/iscsi/nodes
-    if [ $? -eq 0 ] || root_is_iscsi || use_discoveryd ; then
-        start_iscsid 
-        return $?
-    fi
-
-    return 0
+    start_iscsid 
+    return $?
 }
 
 stop() {
diff --git a/iscsidevs.init b/iscsidevs.init
index 57528e0..833fc35 100755
--- a/iscsidevs.init
+++ b/iscsidevs.init
@@ -36,10 +36,6 @@ start() {
     # again when the network is up
     [ ! -f /var/lock/subsys/network ] && ! nm-online -t 60 >/dev/null 2>&1 && exit 3
 
-    # if no nodes are setup to startup automatically exit cleanly
-    grep -qrs "node.startup = automatic" /var/lib/iscsi/nodes
-    [ $? -eq 0 ] || exit 3
-
     # this script is normally called from startup so log into
     # nodes marked node.startup=automatic
     echo -n $"Starting $prog: "