Blame SOURCES/0151-update-initscripts-and-docs.patch

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