rpms/iscsi-initiator-utils/F-9 iscsi-initiator-utils.spec, 1.32, 1.33 iscsid.init, 1.5, 1.6 iscsidevs.init, 1.5, 1.6

[Mike Christie (michaelc)]

Author: michaelc

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4581

Modified Files:
	iscsi-initiator-utils.spec iscsid.init iscsidevs.init 
Log Message:
Fix up from 437522: logout sessions that are running if not using iscsi boot during shutdown.


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsi-initiator-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- iscsi-initiator-utils.spec	6 Apr 2008 06:44:04 -0000	1.32
+++ iscsi-initiator-utils.spec	25 Apr 2008 18:13:15 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.868
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-868-test1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Fri Apr 25 2008 Mike Christie <mchristie at redhat.com> - 6.2.0.868-0.7
+- 437522 log out sessions that are not used for root during "iscsi stop".
+
 * Fri Apr 4 2008 Mike Christie <mchristie at redhat.com> - 6.2.0.868-0.6
 - Rebase to RHEL5 to bring in bug fixes.
 - 437522 iscsi startup does not need to modify with network startup.


Index: iscsid.init
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsid.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iscsid.init	6 Apr 2008 06:44:04 -0000	1.5
+++ iscsid.init	25 Apr 2008 18:13:15 -0000	1.6
@@ -72,15 +72,6 @@
 		return
 	fi
 
-        # If this is a final shutdown/halt, do nothing since
-        # we may need iscsid for as long as possible (halt script kills
-	# us at the last second)
-        if [ "$RUNLEVEL" = "6" -o "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" ]; then
-		rm -f /var/lock/subsys/iscsid
-                success
-                return
-        fi
-
         # don't turn off iscsi if root is possibly on a iscsi disk
         rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)
         if [[ "$rootopts" =~ "_netdev" ]] ; then


Index: iscsidevs.init
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-9/iscsidevs.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iscsidevs.init	6 Apr 2008 06:44:04 -0000	1.5
+++ iscsidevs.init	25 Apr 2008 18:13:15 -0000	1.6
@@ -70,16 +70,6 @@
 		return
 	fi
 
-	# If this is a final shutdown/halt, do nothing since
-	# lvm/dm, md, power path, etc do not always handle this nicely.
-	# The kernel will do the right thing and shutdown devices (send
-	# cache syncs, start_stops, etc) that need it.
-	if [ "$RUNLEVEL" = "6" -o "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" ]; then
-		rm -f /var/lock/subsys/iscsi
-		success
-		return
-	fi
-
 	# don't turn off iscsi if root is possibly on a iscsi disk
 	rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)
 	if [[ "$rootopts" =~ "_netdev" ]] ; then