rpms/iscsi-initiator-utils/F-7 .cvsignore, 1.13, 1.14 iscsi-initiator-utils-use-var-for-config.patch, 1.4, 1.5 iscsi-initiator-utils.spec, 1.28, 1.29 sources, 1.13, 1.14

[Mike Christie (michaelc)]

Author: michaelc

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

Modified Files:
	.cvsignore iscsi-initiator-utils-use-var-for-config.patch 
	iscsi-initiator-utils.spec sources 
Log Message:
Fix service iscsi stop, so that it logs out targets.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-7/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Jun 2007 18:13:30 -0000	1.13
+++ .cvsignore	25 Jun 2007 18:07:34 -0000	1.14
@@ -8,3 +8,4 @@
 open-iscsi-6.2.0.695.tar.bz2
 open-iscsi-2.0-754.tar.gz
 open-iscsi-2.0-865.tar.gz
+open-iscsi-2.0-865.2.tar.gz

iscsi-initiator-utils-use-var-for-config.patch:

Index: iscsi-initiator-utils-use-var-for-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-7/iscsi-initiator-utils-use-var-for-config.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iscsi-initiator-utils-use-var-for-config.patch	18 Jun 2007 18:13:30 -0000	1.4
+++ iscsi-initiator-utils-use-var-for-config.patch	25 Jun 2007 18:07:34 -0000	1.5
@@ -1,6 +1,22 @@
-diff -aurp open-iscsi-2.0-865/usr/idbm.h open-iscsi-2.0-865.work/usr/idbm.h
---- open-iscsi-2.0-865/usr/idbm.h	2007-06-12 04:29:28.000000000 -0500
-+++ open-iscsi-2.0-865.work/usr/idbm.h	2007-06-13 12:55:52.000000000 -0500
+diff -aurp open-iscsi-2.0-865.1/usr/idbm.c open-iscsi-2.0-865.1.work/usr/idbm.c
+--- open-iscsi-2.0-865.1/usr/idbm.c	2007-06-21 13:17:40.000000000 -0500
++++ open-iscsi-2.0-865.1.work/usr/idbm.c	2007-06-21 13:20:27.000000000 -0500
+@@ -2546,9 +2546,9 @@ idbm_init(char *configfile)
+ 	idbm_t *db;
+ 
+ 	/* make sure root db dir is there */
+-	if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
+-		if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
+-			log_error("Could not make %s %d\n", ISCSI_CONFIG_ROOT,
++	if (access(ISCSIVAR, F_OK) != 0) {
++		if (mkdir(ISCSIVAR, 0660) != 0) {
++			log_error("Could not make %s %d\n", ISCSIVAR,
+ 				   errno);
+ 			return NULL;
+ 		}
+diff -aurp open-iscsi-2.0-865.1/usr/idbm.h open-iscsi-2.0-865.1.work/usr/idbm.h
+--- open-iscsi-2.0-865.1/usr/idbm.h	2007-06-21 13:18:31.000000000 -0500
++++ open-iscsi-2.0-865.1.work/usr/idbm.h	2007-06-21 13:18:41.000000000 -0500
 @@ -26,12 +26,14 @@
  #include "initiator.h"
  #include "config.h"


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-7/iscsi-initiator-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- iscsi-initiator-utils.spec	18 Jun 2007 18:13:30 -0000	1.28
+++ iscsi-initiator-utils.spec	25 Jun 2007 18:07:34 -0000	1.29
@@ -1,8 +1,8 @@
 Summary: The iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.865
-Release: 0.0%{?dist}
-Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-865.tar.gz
+Release: 0.1%{?dist}
+Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-865.2.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
 Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch
@@ -23,7 +23,7 @@
 Protocol networks.
 
 %prep
-%setup -q -n open-iscsi-2.0-865
+%setup -q -n open-iscsi-2.0-865.2
 %patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .use-var-for-config
 
@@ -89,6 +89,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Jun 25 2007 Mike Christie <mchristie at redhat.com> - 6.2.0.865-0.1
+- Rebase to upstream stable which has a fix for the logoutall command. This will fix the service iscsi stop command.
+
 * Tue Jun 12 2007 Mike Christie <mchristie at redhat.com> - 6.2.0.865-0.0
 - Rebase upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Jun 2007 18:13:30 -0000	1.13
+++ sources	25 Jun 2007 18:07:34 -0000	1.14
@@ -1 +1,2 @@
 ed6c5f4a1b3f01bbd6f40dda26f57eb5  open-iscsi-2.0-865.tar.gz
+fd3ae8aee6d25fce5c43e2798412829e  open-iscsi-2.0-865.2.tar.gz