diff --git a/.cvsignore b/.cvsignore index 8ccb956..f435351 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,3 +10,4 @@ open-iscsi-2.0-754.tar.gz open-iscsi-2.0-865.2.tar.gz open-iscsi-2.0-865.13.tar.gz open-iscsi-2.0-868-test1.tar.gz +open-iscsi-2.0-870-rc1.tar.gz diff --git a/iscsi-initiator-utils-ibft-sysfs.patch b/iscsi-initiator-utils-ibft-sysfs.patch index 88105e2..c1db389 100644 --- a/iscsi-initiator-utils-ibft-sysfs.patch +++ b/iscsi-initiator-utils-ibft-sysfs.patch @@ -1,6 +1,6 @@ -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fw_entry.c ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fw_entry.c 2008-01-23 12:07:52.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fw_entry.c +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fw_entry.c 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fw_entry.c 2008-06-30 21:21:57.000000000 -0500 @@ -29,7 +29,8 @@ int fw_get_entry(struct boot_context *co ret = fwparam_ppc(context, filepath); @@ -11,9 +11,9 @@ diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fw_entry.c open-iscsi-2. return ret; } -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft.h ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft.h 2008-01-23 12:07:52.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft.h open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft.h +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft.h 2008-06-30 21:21:57.000000000 -0500 @@ -153,6 +153,7 @@ extern int dev_count; #define TARGET "target" @@ -23,9 +23,9 @@ diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft.h open-iscs extern int fwparam_ppc(struct boot_context *context, const char *filepath); - #endif /* FWPARAM_IBFT_H_ */ -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft_sysfs.c ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-01-23 12:08:04.000000000 -0600 +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/fwparam_ibft_sysfs.c 1969-12-31 18:00:00.000000000 -0600 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c 2008-06-30 21:21:57.000000000 -0500 @@ -0,0 +1,271 @@ +/* + * Copyright (C) IBM Corporation. 2007 @@ -298,19 +298,15 @@ diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/fwparam_ibft_sysfs.c ope + deallocate_lists(); + return rc; +} -diff -Naurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/Makefile ---- open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.curr/utils/fwparam_ibft/Makefile 2008-01-23 12:07:52.000000000 -0600 -@@ -21,11 +21,10 @@ - # "Prasanna Mumbai" +diff -Naurp open-iscsi-2.0-870-rc1/utils/fwparam_ibft/Makefile open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/Makefile +--- open-iscsi-2.0-870-rc1/utils/fwparam_ibft/Makefile 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/utils/fwparam_ibft/Makefile 2008-06-30 21:22:44.000000000 -0500 +@@ -22,7 +22,7 @@ # --OBJS := fwparam_ibft.o fw_entry.o -+OBJS := fwparam_ibft.o fw_entry.o fwparam_ibft_sysfs.o - OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o - GENFILES := prom_lex.c prom_parse.tab.c prom_parse.tab.h - CLEANFILES = $(OBJS) $(GENFILES) *.output *~ -- - BISONFLAGS = -d - FLEXFLAGS = -t - # turn off #line number markers + OBJS := fwparam_ibft.o fw_entry.o +-OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o ++OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_ibft_sysfs.o + CLEANFILES = $(OBJS) *.output *~ + + OPTFLAGS ?= -O2 -g -fPIC diff --git a/iscsi-initiator-utils-update-initscripts-and-docs.patch b/iscsi-initiator-utils-update-initscripts-and-docs.patch index e3882be..35518c1 100644 --- a/iscsi-initiator-utils-update-initscripts-and-docs.patch +++ b/iscsi-initiator-utils-update-initscripts-and-docs.patch @@ -1,7 +1,7 @@ -diff -aurp open-iscsi-2.0-868-test1/etc/iscsid.conf open-iscsi-2.0-868-test1.tmp/etc/iscsid.conf ---- open-iscsi-2.0-868-test1/etc/iscsid.conf 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/etc/iscsid.conf 2008-01-03 13:55:59.000000000 -0600 -@@ -27,8 +20,8 @@ +diff -aurp open-iscsi-2.0-870-rc1/etc/iscsid.conf open-iscsi-2.0-870-rc1.work/etc/iscsid.conf +--- open-iscsi-2.0-870-rc1/etc/iscsid.conf 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/etc/iscsid.conf 2008-06-30 21:08:29.000000000 -0500 +@@ -27,8 +27,8 @@ # To request that the iscsi initd scripts startup a session set to "automatic". # node.startup = automatic # @@ -12,75 +12,9 @@ diff -aurp open-iscsi-2.0-868-test1/etc/iscsid.conf open-iscsi-2.0-868-test1.tmp # ************* # CHAP Settings -@@ -92,17 +85,6 @@ node.conn[0].timeo.noop_out_interval = 5 - # this will cause the IO to be failed to the multipath layer. - node.conn[0].timeo.noop_out_timeout = 5 - --# To specify the time to wait for abort response before --# failing the operation and trying a logical unit reset edit the line. --# The value is in seconds and the default is 15 seconds. --node.session.err_timeo.abort_timeout = 15 -- --# To specify the time to wait for a logical unit response --# before failing the operation and trying session re-establishment --# edit the line. --# The value is in seconds and the default is 30 seconds. --node.session.err_timeo.lu_reset_timeout = 20 -- - #****** - # Retry - #****** -@@ -188,41 +170,24 @@ node.conn[0].iscsi.MaxRecvDataSegmentLen - discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768 - - # To allow the targets to control the setting of the digest checking, --# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines: -+# with the initiator requesting a preference of enabling the checking, uncommen -+# the following lines (Data digests are not supported and on ppc/ppc64 -+# both header and data digests are not supported.): - #node.conn[0].iscsi.HeaderDigest = CRC32C,None --#node.conn[0].iscsi.DataDigest = CRC32C,None - # - # To allow the targets to control the setting of the digest checking, - # with the initiator requesting a preference of disabling the checking, --# uncomment one or both of the following lines: -+# uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = None,CRC32C --#node.conn[0].iscsi.DataDigest = None,CRC32C - # - # To enable CRC32C digest checking for the header and/or data part of --# iSCSI PDUs, uncomment one or both of the following lines: -+# iSCSI PDUs, uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = CRC32C --#node.conn[0].iscsi.DataDigest = CRC32C - # - # To disable digest checking for the header and/or data part of --# iSCSI PDUs, uncomment one or both of the following lines: -+# iSCSI PDUs, uncomment the following lines: - #node.conn[0].iscsi.HeaderDigest = None --#node.conn[0].iscsi.DataDigest = None - # - # The default is to never use DataDigests and to allow the target to control - # the setting of the HeaderDigest checking with the initiator requesting - # a preference of disabling the checking. -- --#************ --# Workarounds --#************ -- --# Some targets like IET prefer after an initiator has sent a task --# management function like an ABORT TASK or LOGICAL UNIT RESET, that --# it does not respond to PDUs like R2Ts. To enable this behavior uncomment --# the following line (The default behavior is Yes): --node.session.iscsi.FastAbort = Yes -- --# Some targets like Equalogic prefer that after an initiator has sent --# a task management function like an ABORT TASK or LOGICAL UNIT RESET, that --# it continue to respond to R2Ts. To enable this uncomment this line --# node.session.iscsi.FastAbort = No -diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README ---- open-iscsi-2.0-868-test1/README 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/README 2008-01-03 13:53:11.000000000 -0600 +diff -aurp open-iscsi-2.0-870-rc1/README open-iscsi-2.0-870-rc1.work/README +--- open-iscsi-2.0-870-rc1/README 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/README 2008-06-30 21:08:29.000000000 -0500 @@ -78,11 +78,6 @@ the cache sync command will fail. - iscsiadm's -P 3 option will not print out scsi devices. - iscsid will not automatically online devices. @@ -93,7 +27,7 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README By default the kernel source found at /lib/modules/`uname -a`/build will be used to compile the open-iscsi modules. To specify a different -@@ -613,7 +608,7 @@ Red Hat or Fedora: +@@ -694,7 +689,7 @@ Red Hat or Fedora: ----------------- To start open-iscsi in Red Hat/Fedora you can do: @@ -102,7 +36,7 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README To get open-iscsi to automatically start at run time you may have to run: -@@ -792,6 +778,8 @@ To login to all the automated nodes, sim +@@ -873,6 +868,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. @@ -111,21 +45,3 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README 8. Advanced Configuration ========================= -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/idbm.c ---- open-iscsi-2.0-868-test1/usr/idbm.c 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.c 2008-01-03 13:52:01.000000000 -0600 -@@ -364,10 +364,14 @@ idbm_recinfo_node(node_rec_t *r, recinfo - __recinfo_int_o4(key, ri, r, conn[i].iscsi.HeaderDigest, - IDBM_SHOW, "None", "CRC32C", "CRC32C,None", - "None,CRC32C", num); -+/* -+ We only support data digests -+ - sprintf(key, "node.conn[%d].iscsi.DataDigest", i); - __recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW, - "None", "CRC32C", "CRC32C,None", - "None,CRC32C", num); -+*/ - sprintf(key, "node.conn[%d].iscsi.IFMarker", i); - __recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW, - "No", "Yes", num); diff --git a/iscsi-initiator-utils-use-var-for-config.patch b/iscsi-initiator-utils-use-var-for-config.patch index c0c99dc..2091d97 100644 --- a/iscsi-initiator-utils-use-var-for-config.patch +++ b/iscsi-initiator-utils-use-var-for-config.patch @@ -1,16 +1,16 @@ -diff -aurp open-iscsi-2.0-868-test1/doc/iscsiadm.8 open-iscsi-2.0-868-test1.tmp/doc/iscsiadm.8 ---- open-iscsi-2.0-868-test1/doc/iscsiadm.8 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/doc/iscsiadm.8 2008-01-03 14:08:44.000000000 -0600 +diff -aurp open-iscsi-2.0-870-rc1/doc/iscsiadm.8 open-iscsi-2.0-870-rc1.work/doc/iscsiadm.8 +--- open-iscsi-2.0-870-rc1/doc/iscsiadm.8 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/doc/iscsiadm.8 2008-06-30 21:36:44.000000000 -0500 @@ -47,7 +47,7 @@ display help text and exit .TP \fB\-I\fR, \fB\-\-interface\fI[iface]\fR The interface argument specifies the iSCSI interface to use for the operation. -iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware +iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware - or offload, the iface config must have the hardware address (iface.hwaddress) + or the iface config must have the hardware address (iface.hwaddress) and the driver/transport_name (iface.transport_name). The iface's name is then the filename of the iface config. For software iSCSI, the iface config -@@ -310,10 +310,10 @@ The configuration file read by \fBiscsid +@@ -317,10 +317,10 @@ The configuration file read by \fBiscsid The file containing the iSCSI InitiatorName and InitiatorAlias read by \fBiscsid\fR and \fBiscsiadm\fR on startup. .TP @@ -23,10 +23,10 @@ diff -aurp open-iscsi-2.0-868-test1/doc/iscsiadm.8 open-iscsi-2.0-868-test1.tmp/ This directory contains the portals. .SH "SEE ALSO" -diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README ---- open-iscsi-2.0-868-test1/README 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/README 2008-01-03 14:05:35.000000000 -0600 -@@ -138,10 +138,10 @@ available on all Linux installations. +diff -aurp open-iscsi-2.0-870-rc1/README open-iscsi-2.0-870-rc1.work/README +--- open-iscsi-2.0-870-rc1/README 2008-06-30 21:37:05.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/README 2008-06-30 21:36:44.000000000 -0500 +@@ -148,10 +148,10 @@ available on all Linux installations. The database contains two tables: @@ -40,7 +40,7 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README The iscsiadm utility is a command-line tool to manage (update, delete, insert, query) the persistent database. -@@ -288,7 +288,7 @@ a scsi_host per HBA port). +@@ -327,7 +327,7 @@ a scsi_host per HBA port). To manage both types of initiator stacks, iscsiadm uses the interface (iface) structure. For each HBA port or for software iscsi for each network device (ethX) or NIC, that you wish to bind sessions to you must create @@ -49,7 +49,7 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README When you run iscsiadm the first time a hardware iscsi driver like qla4xxx is loaded, iscsiadm will create default iface configs for you. The config created -@@ -301,29 +301,29 @@ Running: +@@ -340,29 +340,29 @@ Running: iface0 qla4xxx,00:c0:dd:08:63:e8,default iface1 qla4xxx,00:c0:dd:08:63:ea,default @@ -84,7 +84,7 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README iface.transport_name = tcp iface.hwaddress = 00:C0:DD:08:63:E7 -@@ -347,7 +347,7 @@ but you have not logged in then, iscsiad +@@ -386,7 +386,7 @@ but you have not logged in then, iscsiad all existing bindings. When you then run iscsiadm to do discovery, it will check for interfaces @@ -93,7 +93,7 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README they will be logged in through each iface. This behavior can also be overriden by passing in the interfaces you want to use. For example if you had defined two interface but only wanted to use one you can use the -@@ -361,7 +361,7 @@ we do not bind a session to a iface, the +@@ -400,7 +400,7 @@ we do not bind a session to a iface, the iscsiadm -m discovery -t st -p ip:port -I default -P 1 @@ -102,7 +102,7 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README not pass anything into iscsiadm, running iscsiadm will do the default behavior, where we allow the network subsystem to decide which device to use. -@@ -396,13 +396,13 @@ iscsiadm -m node -p ip:port -I iface0 -- +@@ -435,7 +435,7 @@ iscsiadm -m node -p ip:port -I iface0 -- ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 @@ -111,19 +111,32 @@ diff -aurp open-iscsi-2.0-868-test1/README open-iscsi-2.0-868-test1.tmp/README using software iscsi. If any are found then nodes found during discovery will be setup so that they can logged in through those interfaces. +@@ -483,7 +483,7 @@ iscsiadm -m node -p ip:port -I iface0 -- + existing portals. - - SendTargets iSCSI Discovery with a specific interface. If you + - SendTargets iSCSI Discovery with a specific interface. If you - wish to only use a subset of the interfaces in /etc/iscsi/ifaces + wish to only use a subset of the interfaces in /var/lib/iscsi/ifaces then you can pass them in during discovery: ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 \ -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/idbm.c ---- open-iscsi-2.0-868-test1/usr/idbm.c 2008-01-03 14:07:04.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.c 2008-01-03 14:03:36.000000000 -0600 -@@ -2582,9 +2582,9 @@ idbm_init(idbm_get_config_file_fn *fn) - idbm_t *db; - +@@ -768,8 +768,8 @@ where targetname is the name of the targ + and port of the portal. tpgt, is the portal group tag of + the portal, and is not used in iscsiadm commands except for static + record creation. And iface name is the name of the iscsi interface +-defined in /etc/iscsi/ifaces. If no interface was defined in +-/etc/iscsi/ifaces or passed in, the default behavior is used. ++defined in /var/lib/iscsi/ifaces. If no interface was defined in ++/var/lib/iscsi/ifaces or passed in, the default behavior is used. + Default here is iscsi_tcp/tcp to be used over which ever NIC the + network layer decides is best. + +diff -aurp open-iscsi-2.0-870-rc1/usr/idbm.c open-iscsi-2.0-870-rc1.work/usr/idbm.c +--- open-iscsi-2.0-870-rc1/usr/idbm.c 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/idbm.c 2008-06-30 21:36:44.000000000 -0500 +@@ -2137,9 +2137,9 @@ free_info: + int idbm_init(idbm_get_config_file_fn *fn) + { /* make sure root db dir is there */ - if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) { - if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) { @@ -132,26 +145,22 @@ diff -aurp open-iscsi-2.0-868-test1/usr/idbm.c open-iscsi-2.0-868-test1.tmp/usr/ + if (mkdir(ISCSIVAR, 0660) != 0) { + log_error("Could not make %s %d\n", ISCSIVAR, errno); - return NULL; + return errno; } -Only in open-iscsi-2.0-868-test1.tmp/usr: idbm.c.orig -diff -aurp open-iscsi-2.0-868-test1/usr/idbm.h open-iscsi-2.0-868-test1.tmp/usr/idbm.h ---- open-iscsi-2.0-868-test1/usr/idbm.h 2008-01-03 13:23:36.000000000 -0600 -+++ open-iscsi-2.0-868-test1.tmp/usr/idbm.h 2008-01-03 14:03:36.000000000 -0600 -@@ -26,12 +26,14 @@ +diff -aurp open-iscsi-2.0-870-rc1/usr/idbm.h open-iscsi-2.0-870-rc1.work/usr/idbm.h +--- open-iscsi-2.0-870-rc1/usr/idbm.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/idbm.h 2008-06-30 21:36:58.000000000 -0500 +@@ -26,11 +26,12 @@ #include "initiator.h" #include "config.h" -#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" @@ -159,3 +168,15 @@ diff -aurp open-iscsi-2.0-868-test1/usr/idbm.h open-iscsi-2.0-868-test1.tmp/usr/ #define ST_CONFIG_NAME "st_config" #define TYPE_INT 0 +diff -aurp open-iscsi-2.0-870-rc1/usr/iface.h open-iscsi-2.0-870-rc1.work/usr/iface.h +--- open-iscsi-2.0-870-rc1/usr/iface.h 2008-06-30 20:14:03.000000000 -0500 ++++ open-iscsi-2.0-870-rc1.work/usr/iface.h 2008-06-30 21:36:44.000000000 -0500 +@@ -20,7 +20,7 @@ + #ifndef ISCSI_IFACE_H + #define ISCSI_IFACE_H + +-#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces" ++#define IFACE_CONFIG_DIR "/var/lib/iscsi/ifaces" + + struct iface_rec; + struct list_head; diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 23bf382..f43e6cb 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,23 +1,15 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils -Version: 6.2.0.868 -Release: 0.7%{?dist} -Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-868-test1.tar.gz +Version: 6.2.0.870 +Release: 0.0%{?dist} +Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870-rc1.tar.gz Source1: iscsid.init Source2: iscsidevs.init Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch Patch1: iscsi-initiator-utils-use-var-for-config.patch Patch2: iscsi-initiator-utils-use-red-hat-for-name.patch Patch3: iscsi-initiator-utils-ibft-sysfs.patch -Patch4: iscsi-initiator-utils-add-fw-login.patch -Patch5: iscsi-initiator-utils-use-new-tpgt.patch -Patch6: iscsi-initiator-utils-fix-compile-err-include-limits.patch -Patch7: iscsi-initiator-utils-handle-ipv6-compat-addrs.patch -Patch8: iscsi-initiator-utils-Fix-connection-cleanup-when-iscsid-is-restarted.patch -Patch9: iscsi-initiator-utils-fix-sync-up.patch -Patch10: iscsi-initiator-utils-update-startup-doc.patch -Patch11: iscsi-initiator-utils-fix-segment-len-check.patch -Patch12: iscsi-initiator-utils-print-ibft-net-info.patch +Patch4: iscsi-initiator-utils-print-ibft-net-info.patch Group: System Environment/Daemons License: GPLv2+ @@ -35,20 +27,12 @@ for distributed disk access using SCSI commands sent over Internet Protocol networks. %prep -%setup -q -n open-iscsi-2.0-868-test1 +%setup -q -n open-iscsi-2.0-870-rc1 %patch0 -p1 -b .update-initscripts-and-docs %patch1 -p1 -b .use-var-for-config %patch2 -p1 -b .use-red-hat-for-name %patch3 -p1 -b .ibft-sysfs -%patch4 -p1 -b .add-fw-login -%patch5 -p1 -b .use-new-tpgt -%patch6 -p1 -b .fix-compile-err-include-limits -%patch7 -p1 -b .handle-ipv6-compat-addrs -%patch8 -p1 -b .Fix-connection-cleanup-when-iscsid-is-restarted -%patch9 -p1 -b .fix-sync-up -%patch10 -p1 -b .update-startup-doc -%patch11 -p1 -b .fix-segment-len-check -%patch12 -p1 -b .print-ibft-net-info +%patch4 -p1 -b .print-ibft-net-info %build @@ -124,6 +108,10 @@ fi %changelog +* Mon Jun 30 2008 Mike Christie - 6.2.0.870 +- Rebase to open-iscsi-2-870 +- 453282 Handle sysfs changes. + * Fri Apr 25 2008 Mike Christie - 6.2.0.868-0.7 - 437522 log out sessions that are not used for root during "iscsi stop". diff --git a/sources b/sources index 597d003..321a21c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e453be2213e60cb463353d896a9c3a78 open-iscsi-2.0-868-test1.tar.gz +2740f55611d3ea59a21ec08b25853c55 open-iscsi-2.0-870-rc1.tar.gz