iscsi-initiator-utils/iscsi-initiator-utils-update-initscripts-and-docs.patch

From 4f85b76a1c1bd54dd4d0779c4bf7da485a80b50e Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Tue, 23 Mar 2010 19:24:09 -0500
Subject: [PATCH 3/7] Add Red Hat specific info to docs.

iscsi-initiator-utils-update-initscripts-and-docs.patch
---
 README          |    9 +++------
 etc/iscsid.conf |   23 ++++++++++-------------
 usr/idbm.c      |    4 ++++
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/README b/README
index eadb385..121bd45 100644
--- a/README
+++ b/README
@@ -74,11 +74,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
@@ -813,7 +808,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:
@@ -1012,6 +1007,8 @@ To login to all the automated nodes, simply restart the iscsi service:
 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 --git a/etc/iscsid.conf b/etc/iscsid.conf
index 78c225c..e96833e 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
@@ -17,10 +17,10 @@
 # maintainers.
 #
 # Default for Fedora and RHEL. (uncomment to activate).
-# iscsid.startup = /etc/rc.d/init.d/iscsid force-start
+iscsid.startup = /etc/rc.d/init.d/iscsid force-start
 # 
 # Default for upstream open-iscsi scripts (uncomment to activate).
-iscsid.startup = /sbin/iscsid
+# iscsid.startup = /sbin/iscsid
 
 
 
@@ -110,8 +110,8 @@ iscsid.startup = /sbin/iscsid
 # 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
 
 
 # *************
@@ -329,29 +329,26 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
 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, uncomment
+# the following lines (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 or HeaderDigests.
 #
-
+node.conn[0].iscsi.HeaderDigest = None
 
 #************
 # Workarounds
diff --git a/usr/idbm.c b/usr/idbm.c
index 1428365..8ad8024 100644
--- a/usr/idbm.c
+++ b/usr/idbm.c
@@ -324,9 +324,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
 				 IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
 				 "None,CRC32C", num, 1);
 		sprintf(key, CONN_DATA_DIGEST, i);
+
+#if 0
+We do not support data digests
 		__recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW,
 				 "None", "CRC32C", "CRC32C,None",
 				 "None,CRC32C", num, 1);
+#endif
 		sprintf(key, CONN_IFMARKER, i);
 		__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
 				"No", "Yes", num, 1);
-- 
1.6.6.1