rpms/iscsi-initiator-utils/FC-6 .cvsignore, 1.11, 1.12 iscsi-initiator-utils.spec, 1.27, 1.28 iscsi.init, 1.6, 1.7 sources, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28859

Modified Files:
	.cvsignore iscsi-initiator-utils.spec iscsi.init sources 
Log Message:
update FC6 iscsi-initiator-utils to open-iscsi-2.0-730.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Sep 2006 20:39:14 -0000	1.11
+++ .cvsignore	13 Nov 2006 20:37:46 -0000	1.12
@@ -6,3 +6,5 @@
 open-iscsi-6.1.1.645.tar.bz2
 open-iscsi-6.1.1.685.tar.bz2
 open-iscsi-6.2.0.695.tar.bz2
+open-iscsi-2.0-727.tar.gz
+open-iscsi-2.0-730.tar.gz


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-6/iscsi-initiator-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- iscsi-initiator-utils.spec	26 Oct 2006 18:18:21 -0000	1.27
+++ iscsi-initiator-utils.spec	13 Nov 2006 20:37:46 -0000	1.28
@@ -1,15 +1,12 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 6.2.0.695
-Release: 0.7%{?dist}
-Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-6.2.0.695.tar.bz2
+Version: 6.2.0.730
+Release: 0.8%{?dist}
+Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-730.tar.gz
 Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
 Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
-Patch2: iscsi-initiator-utils-fix-session-mixup-on-restart.patch
-Patch3: iscsi-initiator-utils-use-var-for-pid.patch
-Patch4: iscsi-initiator-utils-use-var-for-lock.patch
-Patch5: iscsi-initiator-utils-use-var-for-config.patch
+Patch2: iscsi-initiator-utils-use-var-for-config.patch
 
 Group: System Environment/Daemons
 License: GPL
@@ -26,13 +23,10 @@
 Protocol networks.
 
 %prep
-%setup -q -n open-iscsi-%{version}
+%setup -q -n open-iscsi-2.0-730
 %patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .add-iscsi-iname
-%patch2 -p1 -b .fix-session-mixup-on-restart
-%patch3 -p1 -b .use-var-for-pid
-%patch4 -p1 -b .use-var-for-lock
-%patch5 -p1 -b .use-var-for-config
+%patch2 -p1 -b .use-var-for-config
 
 %build
 make OPTFLAGS="%{optflags}" -C usr
@@ -85,6 +79,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Nov 7 2006 Mike Christie <mchristie at redhat.com> - 6.2.0.695-0.8
+- Rebase to upstream open-iscsi-2.0-730.
+
 * Tue Oct 17 2006 Mike Christie <mchristie at redhat.com> - 6.2.0.695-0.7
 - Change period to colon in default name
 


Index: iscsi.init
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-6/iscsi.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iscsi.init	6 Oct 2006 01:33:11 -0000	1.6
+++ iscsi.init	13 Nov 2006 20:37:46 -0000	1.7
@@ -26,6 +26,7 @@
 
 	echo -n $"Starting iSCSI initiator service: "
 	modprobe -q iscsi_tcp
+	modprobe -q ib_iser
 	daemon iscsid
 	RETVAL=$?
 	echo
@@ -61,6 +62,7 @@
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/iscsi
 
+	modprobe -r ib_iser 2>/dev/null
 	modprobe -r iscsi_tcp 2>/dev/null
 }
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Sep 2006 20:39:14 -0000	1.11
+++ sources	13 Nov 2006 20:37:46 -0000	1.12
@@ -1 +1 @@
-01b98ae5349609977c795cc039cd33d3  open-iscsi-6.2.0.695.tar.bz2
+6aea522b7e5699d4934ec37a11c82b78  open-iscsi-2.0-730.tar.gz