rpms/iscsi-initiator-utils/FC-6 .cvsignore, 1.15, 1.16 iscsi-initiator-utils.spec, 1.31, 1.32 sources, 1.15, 1.16

[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-serv4406

Modified Files:
	.cvsignore iscsi-initiator-utils.spec sources 
Log Message:
rebase iscsi package


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	28 Nov 2006 20:50:04 -0000	1.15
+++ .cvsignore	6 Feb 2007 18:49:23 -0000	1.16
@@ -11,3 +11,4 @@
 open-iscsi-2.0-737.tar.gz
 open-iscsi-2.0-742.tar.gz
 open-iscsi-2.0-747.tar.gz
+open-iscsi-2.0-754.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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- iscsi-initiator-utils.spec	28 Nov 2006 20:50:04 -0000	1.31
+++ iscsi-initiator-utils.spec	6 Feb 2007 18:49:23 -0000	1.32
@@ -1,9 +1,10 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 6.2.0.747
+Version: 6.2.0.754
 Release: 0.0%{?dist}
-Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-747.tar.gz
-Source1: iscsi.init
+Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-754.tar.gz
+Source1: iscsid.init
+Source2: iscsidevs.init
 Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch
 Patch1: iscsi-initiator-utils-add-iscsi-iname.patch
 Patch2: iscsi-initiator-utils-use-var-for-config.patch
@@ -23,7 +24,7 @@
 Protocol networks.
 
 %prep
-%setup -q -n open-iscsi-2.0-747
+%setup -q -n open-iscsi-2.0-754
 %patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .add-iscsi-iname
 %patch2 -p1 -b .use-var-for-config
@@ -51,7 +52,8 @@
 #install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
 install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc/iscsi
 
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsid
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,11 +62,13 @@
 if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then
 	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi
 fi
+/sbin/chkconfig --add iscsid
 /sbin/chkconfig --add iscsi
 
 %preun
 if [ "$1" = "0" ]; then
-    /sbin/chkconfig --del iscsi
+	/sbin/chkconfig --del iscsi
+	/sbin/chkconfig --del iscsid
 fi
 
 %files
@@ -74,11 +78,17 @@
 %dir /var/lib/iscsi/send_targets
 %dir /var/lock/iscsi
 %config /etc/rc.d/init.d/iscsi
+%config /etc/rc.d/init.d/iscsid
 %attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf
 /sbin/*
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 6 2007 Mike Christie <mchristie at redhat.com> - 6.2.0.754-0.0
+- Rebase to upstream.
+- Add back --map functionality but in session mode to match RHEL5 fixes
+- Break up iscsi init script into two, so iscsid can be started early for root
+
 * Tue Nov 28 2006 Mike Christie <mchristie at redhat.com> - 6.2.0.747-0.0
 - Fix several bugs in actor.c (iscsi scheduling). This should result
 - in better dm-multipath intergation and fix bugs where time outs


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	28 Nov 2006 20:50:04 -0000	1.15
+++ sources	6 Feb 2007 18:49:23 -0000	1.16
@@ -1 +1 @@
-2f931e238cc21f21b24402cc661ac747  open-iscsi-2.0-747.tar.gz
+2e7ce941ea4e4eda7c82f0b272a33bf9  open-iscsi-2.0-754.tar.gz