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