rpms/iscsi-initiator-utils/devel iscsid.init,1.7,1.8

[Mike Christie]

Author: michaelc

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15727/devel

Modified Files:
	iscsid.init 
Log Message:
Resolves: sync up iscsid init scripts.


Index: iscsid.init
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsid.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- iscsid.init	8 Nov 2008 12:44:13 -0000	1.7
+++ iscsid.init	11 May 2010 22:48:30 -0000	1.8
@@ -37,6 +37,8 @@ force_start() {
     echo -n $"Starting $prog: "
     modprobe -q iscsi_tcp
     modprobe -q ib_iser
+    modprobe -q cxgb3i
+    modprobe -q be2iscsi
     daemon $prog
     retval=$?
     echo
@@ -59,7 +61,7 @@ start() {
 }
 
 stop() {
-    declare -a iparams=( $(iscsiadm -m session 2>/dev/null | egrep "tcp|iser") )
+    declare -a iparams=( $(iscsiadm -m session 2>/dev/null | egrep "tcp|iser|bnx2i|cxgb3i|be2iscsi") )
     if [[ -n "${iparams[*]}" ]]; then
         # We have active sessions, so don't stop iscsid!!
         echo -n $"Not stopping $prog: iscsi sessions still active"
@@ -73,6 +75,11 @@ stop() {
     retval=$?
     echo
 
+    # only remove the iscsi drivers when offload is used
+    rmmod cxgb3i 2>/dev/null
+
+    modprobe -r be2iscsi 2>/dev/null
+
     modprobe -r ib_iser 2>/dev/null
     modprobe -r iscsi_tcp 2>/dev/null