From ec32d8627531829aa6e8e6d7be94bf5e258563c4 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Feb 04 2012 08:58:21 +0000
Subject: Fix iscsi network check


This adds network to be required. If NM is not used then this
is required. If NM is used then network.service should not be setup
and we are ok.

---

diff --git a/iscsidevs.init b/iscsidevs.init
index c2f55ba..2ca316b 100755
--- a/iscsidevs.init
+++ b/iscsidevs.init
@@ -5,16 +5,9 @@
 # chkconfig: 345 13 89
 # description: Logs into iSCSI targets needed at system startup
 
-# Note we should have $network in Required-Start/Stop but we don't because if
-# we would require network chkconfig will put us directly after NetworkManager
-# when using NM, which will make our see if the network is up test succeed
-# while NM is actually still configuring the network. By not requiring network
-# chkconfig will use the chkconfig header to determine our start prio, starting
-# us after the old network service, but before NM (netfs does this the same).
-
 ### BEGIN INIT INFO
 # Provides:          iscsi
-# Required-Start:    iscsid
+# Required-Start:    iscsid network
 # Should-Start:      tgtd
 # Required-Stop:     iscsid
 # Should-Stop:       tgtd