6bbb92
From c255c2cd43afeaefa428237a3200f02fb238d89e Mon Sep 17 00:00:00 2001
0e55d5
From: Chris Leech <cleech@redhat.com>
0e55d5
Date: Mon, 19 Nov 2012 16:37:13 -0800
0e55d5
Subject: update initscripts and docs
0e55d5
0e55d5
---
0e55d5
 README          |  9 +++------
0e55d5
 etc/iscsid.conf | 23 +++++++++++------------
0e55d5
 usr/idbm.c      |  4 ++++
0e55d5
 3 files changed, 18 insertions(+), 18 deletions(-)
0e55d5
0e55d5
diff --git a/README b/README
0e55d5
index ec22098..2a8319a 100644
0e55d5
--- a/README
0e55d5
+++ b/README
0e55d5
@@ -74,11 +74,6 @@ the cache sync command will fail.
0e55d5
 - iscsiadm's -P 3 option will not print out scsi devices.
0e55d5
 - iscsid will not automatically online devices.
0e55d5
 
0e55d5
-You need to enable "Cryptographic API" under "Cryptographic options" in the
0e55d5
-kernel config. And you must enable "CRC32c CRC algorithm" even if
0e55d5
-you do not use header or data digests. They are the kernel options,
0e55d5
-CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively.
0e55d5
-
0e55d5
 By default the kernel's iSCSI modules will be used. Running:
0e55d5
 
0e55d5
 	make
0e55d5
@@ -997,7 +992,7 @@ Red Hat or Fedora:
0e55d5
 -----------------
0e55d5
 To start open-iscsi in Red Hat/Fedora you can do:
0e55d5
 
0e55d5
-	service open-iscsi start
0e55d5
+	service iscsi start
0e55d5
 
0e55d5
 To get open-iscsi to automatically start at run time you may have to
0e55d5
 run:
0e55d5
@@ -1205,6 +1200,8 @@ iscsid will only perform rediscovery when it gets a SCN from the server.
0e55d5
 #   linux-isns (SLES's iSNS server) where it sometimes does not send SCN
0e55d5
 #   events in the proper format, so they may not get handled.
0e55d5
 
0e55d5
+To set the startup value, so that nodes are not logged into automatically
0e55d5
+use the value "manual".
0e55d5
 
0e55d5
 Example:
0e55d5
 --------
0e55d5
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
0e55d5
index ef76dc0..ac1d231 100644
0e55d5
--- a/etc/iscsid.conf
0e55d5
+++ b/etc/iscsid.conf
5ebdd5
@@ -17,10 +17,10 @@
5ebdd5
 # maintainers.
5ebdd5
 #
5ebdd5
 # Default for Fedora and RHEL. (uncomment to activate).
5ebdd5
-# iscsid.startup = /etc/rc.d/init.d/iscsid force-start
5ebdd5
+iscsid.startup = /etc/rc.d/init.d/iscsid force-start
5ebdd5
 # 
5ebdd5
 # Default for upstream open-iscsi scripts (uncomment to activate).
5ebdd5
-iscsid.startup = /sbin/iscsid
5ebdd5
+# iscsid.startup = /sbin/iscsid
5ebdd5
 
5ebdd5
 
1c8eda
 #############################
1c8eda
@@ -36,8 +36,8 @@ iscsid.startup = /sbin/iscsid
5ebdd5
 # To request that the iscsi initd scripts startup a session set to "automatic".
5ebdd5
 # node.startup = automatic
5ebdd5
 #
5ebdd5
-# To manually startup the session set to "manual". The default is manual.
5ebdd5
-node.startup = manual
5ebdd5
+# To manually startup the session set to "manual". The default is automatic.
5ebdd5
+node.startup = automatic
5ebdd5
 
Mike Christie 3949e1
 # For "automatic" startup nodes, setting this to "Yes" will try logins on each
Mike Christie 3949e1
 # available iface until one succeeds, and then stop.  The default "No" will try
0e55d5
@@ -259,28 +259,27 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
5ebdd5
 discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
5ebdd5
 
5ebdd5
 # To allow the targets to control the setting of the digest checking,
5ebdd5
-# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines:
5ebdd5
+# with the initiator requesting a preference of enabling the checking, uncomment
5ebdd5
+# the following lines (Data digests are not supported.):
5ebdd5
 #node.conn[0].iscsi.HeaderDigest = CRC32C,None
5ebdd5
-#node.conn[0].iscsi.DataDigest = CRC32C,None
Mike Christie 3949e1
+
5ebdd5
 #
5ebdd5
 # To allow the targets to control the setting of the digest checking,
5ebdd5
 # with the initiator requesting a preference of disabling the checking,
5ebdd5
-# uncomment one or both of the following lines:
Mike Christie 3949e1
+# uncomment the following line:
5ebdd5
 #node.conn[0].iscsi.HeaderDigest = None,CRC32C
5ebdd5
-#node.conn[0].iscsi.DataDigest = None,CRC32C
5ebdd5
 #
5ebdd5
 # To enable CRC32C digest checking for the header and/or data part of
5ebdd5
-# iSCSI PDUs, uncomment one or both of the following lines:
Mike Christie 3949e1
+# iSCSI PDUs, uncomment the following line:
5ebdd5
 #node.conn[0].iscsi.HeaderDigest = CRC32C
5ebdd5
-#node.conn[0].iscsi.DataDigest = CRC32C
5ebdd5
 #
5ebdd5
 # To disable digest checking for the header and/or data part of
5ebdd5
-# iSCSI PDUs, uncomment one or both of the following lines:
Mike Christie 3949e1
+# iSCSI PDUs, uncomment the following line:
5ebdd5
 #node.conn[0].iscsi.HeaderDigest = None
5ebdd5
-#node.conn[0].iscsi.DataDigest = None
5ebdd5
 #
5ebdd5
 # The default is to never use DataDigests or HeaderDigests.
5ebdd5
 #
5ebdd5
+node.conn[0].iscsi.HeaderDigest = None
5ebdd5
 
Mike Christie 3949e1
 # For multipath configurations, you may want more than one session to be
Mike Christie 3949e1
 # created on each iface record.  If node.session.nr_sessions is greater
0e55d5
diff --git a/usr/idbm.c b/usr/idbm.c
0e55d5
index 4d30aa9..a1d7d37 100644
0e55d5
--- a/usr/idbm.c
0e55d5
+++ b/usr/idbm.c
0e55d5
@@ -399,9 +399,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
5ebdd5
 				 IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
5ebdd5
 				 "None,CRC32C", num, 1);
5ebdd5
 		sprintf(key, CONN_DATA_DIGEST, i);
5ebdd5
+
5ebdd5
+#if 0
5ebdd5
+We do not support data digests
5ebdd5
 		__recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW,
5ebdd5
 				 "None", "CRC32C", "CRC32C,None",
5ebdd5
 				 "None,CRC32C", num, 1);
5ebdd5
+#endif
5ebdd5
 		sprintf(key, CONN_IFMARKER, i);
5ebdd5
 		__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
5ebdd5
 				"No", "Yes", num, 1);
0e55d5
-- 
0e55d5
1.7.11.7
0e55d5