rpms/iscsi-initiator-utils/F-7 .cvsignore, 1.12, 1.13 iscsi-initiator-utils-update-initscripts-and-docs.patch, 1.1, 1.2 iscsi-initiator-utils-use-var-for-config.patch, 1.3, 1.4 iscsi-initiator-utils.spec, 1.27, 1.28 sources, 1.12, 1.13
Mike Christie (michaelc)
fedora-extras-commits at redhat.com
Mon Jun 18 18:14:06 UTC 2007
Author: michaelc
Update of /cvs/pkgs/rpms/iscsi-initiator-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7433
Modified Files:
.cvsignore
iscsi-initiator-utils-update-initscripts-and-docs.patch
iscsi-initiator-utils-use-var-for-config.patch
iscsi-initiator-utils.spec sources
Log Message:
rebase to upstream
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 20 Mar 2007 19:39:20 -0000 1.12
+++ .cvsignore 18 Jun 2007 18:13:30 -0000 1.13
@@ -7,3 +7,4 @@
open-iscsi-6.1.1.685.tar.bz2
open-iscsi-6.2.0.695.tar.bz2
open-iscsi-2.0-754.tar.gz
+open-iscsi-2.0-865.tar.gz
iscsi-initiator-utils-update-initscripts-and-docs.patch:
Index: iscsi-initiator-utils-update-initscripts-and-docs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-7/iscsi-initiator-utils-update-initscripts-and-docs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iscsi-initiator-utils-update-initscripts-and-docs.patch 20 Mar 2007 19:39:20 -0000 1.1
+++ iscsi-initiator-utils-update-initscripts-and-docs.patch 18 Jun 2007 18:13:30 -0000 1.2
@@ -1,7 +1,7 @@
-diff -aurp open-iscsi-2.0-737/etc/iscsid.conf open-iscsi-2.0-737.work/etc/iscsid.conf
---- open-iscsi-2.0-737/etc/iscsid.conf 2006-11-22 14:21:17.000000000 -0600
-+++ open-iscsi-2.0-737.work/etc/iscsid.conf 2006-11-24 16:26:17.000000000 -0600
-@@ -14,8 +14,8 @@
+diff -aurp open-iscsi-2.0-865/etc/iscsid.conf open-iscsi-2.0-865.work/etc/iscsid.conf
+--- open-iscsi-2.0-865/etc/iscsid.conf 2007-06-11 23:06:31.000000000 -0500
++++ open-iscsi-2.0-865.work/etc/iscsid.conf 2007-06-13 12:36:15.000000000 -0500
+@@ -27,8 +27,8 @@
# To request that the iscsi initd scripts startup a session set to "automatic".
# node.startup = automatic
#
@@ -12,46 +12,24 @@
# *************
# CHAP Settings
-diff -aurp open-iscsi-2.0-737/README open-iscsi-2.0-737.work/README
---- open-iscsi-2.0-737/README 2006-11-22 14:32:55.000000000 -0600
-+++ open-iscsi-2.0-737.work/README 2006-11-24 16:38:37.000000000 -0600
-@@ -303,19 +303,10 @@ option. For example this would mount a i
+diff -aurp open-iscsi-2.0-865/README open-iscsi-2.0-865.work/README
+--- open-iscsi-2.0-865/README 2007-06-12 04:29:28.000000000 -0500
++++ open-iscsi-2.0-865.work/README 2007-06-13 12:42:38.000000000 -0500
+@@ -605,7 +605,7 @@ Red Hat or Fedora:
+ -----------------
+ To start open-iscsi in Red Hat/Fedora you can do:
+
+- service open-iscsi start
++ service iscsi start
+
+ To get open-iscsi to automatically start at run time you may have to
+ run:
+@@ -781,6 +781,8 @@ To login to all the automated nodes, sim
+ e.g /etc/init.d/open-iscsi restart. On your next startup the nodes will
+ be logged into autmotically.
- /dev/sdb /mnt/iscsi ext3 _netdev 0 0
-
--SUSE or Debian:
-----------------
--Otherwise, if there is a initd script for your distro in etc/initd that
--gets installed with "make install"
--
-- /etc/init.d/open-iscsi start
--
--will usually get you started.
--
--Other:
-+Manual:
- ------
--If there is no initd script, you must start the tools by hand. First load the
--iscsi modules with:
-+If there is no initd script or you wish to run iscsi manually, you must start
-+the tools by hand. First load the iscsi modules with:
-
- modprobe -q iscsi_tcp
-
-@@ -358,8 +349,6 @@ storage), it is better to automate the l
-
- 3. automate target logins for future system reboots
- ---------------------------------------------------
--Note: this may only work for Red Hat, Fedora and SUSE configurations
--
- To automate login to a node, use the following with the record ID of the
- node discovered in the discovery above:
- iscsiadm -m node -T targetname -p ip:port --op update -n node.conn[0].startup -v automatic
-@@ -372,7 +361,6 @@ all sessions add the following to the /e
- To login to all the automated nodes, simply restart the iscsi service
- e.g /etc/init.d/open-iscsi restart
-
--
- 8. TBD
- ======
++To set the startup value, so that nodes are not logged into automatically
++use the value "manual".
+ 8. iSCSI System Info
+ ====================
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iscsi-initiator-utils-use-var-for-config.patch 20 Mar 2007 19:52:42 -0000 1.3
+++ iscsi-initiator-utils-use-var-for-config.patch 18 Jun 2007 18:13:30 -0000 1.4
@@ -1,78 +1,24 @@
-diff -aurp open-iscsi-6.2.0.695/usr/idbm.c open-iscsi-6.2.0.695.work/usr/idbm.c
---- open-iscsi-6.2.0.695/usr/idbm.c 2006-10-03 13:54:51.000000000 -0500
-+++ open-iscsi-6.2.0.695.work/usr/idbm.c 2006-10-03 14:44:56.000000000 -0500
-@@ -831,10 +831,18 @@ idbm_node_write(idbm_t *db, node_rec_t *
+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
+@@ -26,12 +26,14 @@
+ #include "initiator.h"
+ #include "config.h"
- idbm_lock(db);
+-#define NODE_CONFIG_DIR ISCSI_CONFIG_ROOT"nodes"
+-#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces"
+-#define SLP_CONFIG_DIR ISCSI_CONFIG_ROOT"slp"
+-#define ISNS_CONFIG_DIR ISCSI_CONFIG_ROOT"isns"
+-#define STATIC_CONFIG_DIR ISCSI_CONFIG_ROOT"static"
+-#define ST_CONFIG_DIR ISCSI_CONFIG_ROOT"send_targets"
++#define ISCSIVAR "/var/lib/iscsi/"
++
++#define NODE_CONFIG_DIR ISCSIVAR"nodes"
++#define IFACE_CONFIG_DIR ISCSIVAR"ifaces"
++#define SLP_CONFIG_DIR ISCSIVAR"slp"
++#define ISNS_CONFIG_DIR ISCSIVAR"isns"
++#define STATIC_CONFIG_DIR ISCSIVAR"static"
++#define ST_CONFIG_DIR ISCSIVAR"send_targets"
+ #define ST_CONFIG_NAME "st_config"
-- snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
-- if (access(portal, F_OK) != 0) {
-+ /* bah: there has to be a function to make all these subdirs for us */
-+ if (access(CONFIG_DIR, F_OK) != 0) {
- if (mkdir(portal, 0660) != 0) {
-- log_error("Could not make %s\n", portal);
-+ log_error("Could not make %s %d\n", CONFIG_DIR, errno);
-+ rc = errno;
-+ goto free_portal;
-+ }
-+ }
-+
-+ if (access(NODE_CONFIG_DIR, F_OK) != 0) {
-+ if (mkdir(NODE_CONFIG_DIR, 0660) != 0) {
-+ log_error("Could not make %s\n", NODE_CONFIG_DIR);
- rc = errno;
- goto free_portal;
- }
-@@ -869,6 +877,7 @@ free_portal:
- return rc;
- }
-
-+/* TODO: merged these two functions */
- static int
- idbm_discovery_write(idbm_t *db, discovery_rec_t *rec)
- {
-@@ -883,10 +892,18 @@ idbm_discovery_write(idbm_t *db, discove
- }
-
- idbm_lock(db);
-- snprintf(portal, PATH_MAX, "%s", ST_CONFIG_DIR);
-- if (access(portal, F_OK) != 0) {
-- if (mkdir(portal, 0660) != 0) {
-- log_error("Could not make %s\n", portal);
-+
-+ if (access(CONFIG_DIR, F_OK) != 0) {
-+ if (mkdir(CONFIG_DIR, 0660) != 0) {
-+ log_error("Could not make %s %d\n", CONFIG_DIR, errno);
-+ rc = errno;
-+ goto free_portal;
-+ }
-+ }
-+
-+ if (access(ST_CONFIG_DIR, F_OK) != 0) {
-+ if (mkdir(ST_CONFIG_DIR, 0660) != 0) {
-+ log_error("Could not make %s\n", ST_CONFIG_DIR);
- rc = errno;
- goto free_portal;
- }
-diff -aurp open-iscsi-6.2.0.695/usr/initiator.h open-iscsi-6.2.0.695.work/usr/initiator.h
---- open-iscsi-6.2.0.695/usr/initiator.h 2006-10-03 13:54:51.000000000 -0500
-+++ open-iscsi-6.2.0.695.work/usr/initiator.h 2006-10-03 14:08:09.000000000 -0500
-@@ -31,11 +31,15 @@
- #include "actor.h"
- #include "queue.h"
-
--#define ST_CONFIG_DIR "/etc/iscsi/send_targets"
--#define NODE_CONFIG_DIR "/etc/iscsi/nodes"
-+#define CONFIG_DIR "/var/lib/iscsi"
-+#define ST_CONFIG_DIR "/var/lib/iscsi/send_targets"
-+#define NODE_CONFIG_DIR "/var/lib/iscsi/nodes"
-+
- #define CONFIG_FILE "/etc/iscsi/iscsid.conf"
--#define PID_FILE "/var/run/iscsid.pid"
- #define INITIATOR_NAME_FILE "/etc/iscsi/initiatorname.iscsi"
-+
-+#define PID_FILE "/var/run/iscsid.pid"
-+
- #define LOCK_DIR "/var/lock/iscsi"
- #define LOCK_FILE "/var/lock/iscsi/lock"
- #define LOCK_WRITE_FILE "/var/lock/iscsi/lock.write"
+ #define TYPE_INT 0
Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-7/iscsi-initiator-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- iscsi-initiator-utils.spec 20 Mar 2007 19:39:20 -0000 1.27
+++ iscsi-initiator-utils.spec 18 Jun 2007 18:13:30 -0000 1.28
@@ -1,20 +1,19 @@
-Summary: iSCSI daemon and utility programs
+Summary: The iSCSI daemon and utility programs
Name: iscsi-initiator-utils
-Version: 6.2.0.754
+Version: 6.2.0.865
Release: 0.0%{?dist}
-Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-754.tar.gz
+Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-865.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
+Patch1: iscsi-initiator-utils-use-var-for-config.patch
Group: System Environment/Daemons
License: GPL
URL: http://www.open-iscsi.org
Buildroot: %{_tmppath}/%{name}-root
BuildRequires: openssl-devel
-Prereq: /sbin/chkconfig
+Requires: /sbin/chkconfig
ExcludeArch: s390 s390x
%description
@@ -24,10 +23,9 @@
Protocol networks.
%prep
-%setup -q -n open-iscsi-2.0-754
+%setup -q -n open-iscsi-2.0-865
%patch0 -p1 -b .update-initscripts-and-docs
-%patch1 -p1 -b .add-iscsi-iname
-%patch2 -p1 -b .use-var-for-config
+%patch1 -p1 -b .use-var-for-config
%build
make OPTFLAGS="%{optflags}" -C usr
@@ -44,12 +42,15 @@
mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi
mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/nodes
mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/send_targets
+mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/static
+mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/isns
+mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/slp
+mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/ifaces
mkdir -p $RPM_BUILD_ROOT/var/lock/iscsi
install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
-#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/iscsid
@@ -76,6 +77,10 @@
%doc README
%dir /var/lib/iscsi/nodes
%dir /var/lib/iscsi/send_targets
+%dir /var/lib/iscsi/static
+%dir /var/lib/iscsi/slp
+%dir /var/lib/iscsi/isns
+%dir /var/lib/iscsi/ifaces
%dir /var/lock/iscsi
%config /etc/rc.d/init.d/iscsi
%config /etc/rc.d/init.d/iscsid
@@ -84,6 +89,9 @@
%{_mandir}/*/*
%changelog
+* Tue Jun 12 2007 Mike Christie <mchristie at redhat.com> - 6.2.0.865-0.0
+- Rebase upstream
+
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 20 Mar 2007 19:52:42 -0000 1.12
+++ sources 18 Jun 2007 18:13:30 -0000 1.13
@@ -1 +1 @@
-2e7ce941ea4e4eda7c82f0b272a33bf9 open-iscsi-2.0-754.tar.gz
+ed6c5f4a1b3f01bbd6f40dda26f57eb5 open-iscsi-2.0-865.tar.gz
More information about the fedora-extras-commits
mailing list