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 @@

 # To request that the iscsi initd scripts startup a session set to "automatic".

 # node.startup = automatic

 #

-# To manually startup the session set to "manual". The default is manual.

-node.startup = manual

+# To manually startup the session set to "manual". The default is automatic.

+node.startup = automatic

 # *************

 # 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

@@ -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.

-You need to enable "Cryptographic API" under "Cryptographic options" in the

-kernel config. And you must enable "CRC32c CRC algorithm" even if

-you do not use header or data digests. They are the kernel options,

-CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively.

-

 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:

 -----------------

 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:

@@ -792,6 +778,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.

+To set the startup value, so that nodes are not logged into automatically

+use the value "manual".

 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);