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

fef8d1
From 97b1242450df25648d203acf7cc297cd46d10e8c Mon Sep 17 00:00:00 2001
46c2f0
From: Chris Leech <cleech@redhat.com>
46c2f0
Date: Mon, 19 Nov 2012 16:37:13 -0800
46c2f0
Subject: [PATCH] update initscripts and docs
46c2f0
46c2f0
---
fef8d1
 README          | 12 +++++-------
fef8d1
 etc/iscsid.conf | 23 +++++++++++------------
46c2f0
 usr/idbm.c      |  4 ++++
fef8d1
 3 files changed, 20 insertions(+), 19 deletions(-)
46c2f0
46c2f0
diff --git a/README b/README
fef8d1
index 508c9d7..b62a14e 100644
46c2f0
--- a/README
46c2f0
+++ b/README
46c2f0
@@ -77,11 +77,6 @@ the cache sync command will fail.
46c2f0
 - iscsiadm's -P 3 option will not print out scsi devices.
46c2f0
 - iscsid will not automatically online devices.
46c2f0
 
46c2f0
-You need to enable "Cryptographic API" under "Cryptographic options" in the
46c2f0
-kernel config. And you must enable "CRC32c CRC algorithm" even if
46c2f0
-you do not use header or data digests. They are the kernel options
46c2f0
-CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively.
46c2f0
-
46c2f0
 The userspace components iscsid, iscsiadm and iscsistart require the
46c2f0
 open-isns library, which can be found here:
46c2f0
 	https://github.com/gonzoleeman/open-isns/releases
fef8d1
@@ -1163,11 +1158,11 @@ Red Hat or Fedora:
46c2f0
 -----------------
46c2f0
 To start open-iscsi in Red Hat/Fedora you can do:
46c2f0
 
fef8d1
-	systemctl start open-iscsi
fef8d1
+	systemctl start iscsi
46c2f0
 
46c2f0
 To get open-iscsi to automatically start at run time you may have to
46c2f0
 run:
fef8d1
-	systemctl enable open-iscsi
fef8d1
+	systemctl enable iscsi
fef8d1
 
fef8d1
 And, to automatically mount a file system during startup
fef8d1
 you must have the partition entry in /etc/fstab marked with the "_netdev"
fef8d1
@@ -1370,6 +1365,9 @@ iscsid will only perform rediscovery when it gets a SCN from the server.
46c2f0
 #   linux-isns (SLES's iSNS server) where it sometimes does not send SCN
46c2f0
 #   events in the proper format, so they may not get handled.
46c2f0
 
46c2f0
+To set the startup value, so that nodes are not logged into automatically
46c2f0
+use the value "manual".
46c2f0
+
46c2f0
 Examples
46c2f0
 --------
46c2f0
 
46c2f0
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
fef8d1
index f21ed3d..420145b 100644
46c2f0
--- a/etc/iscsid.conf
46c2f0
+++ b/etc/iscsid.conf
fef8d1
@@ -19,8 +19,8 @@
46c2f0
 # the time then leave this attribute commented out.
46c2f0
 #
46c2f0
 # Default for Fedora and RHEL. (uncomment to activate).
fef8d1
-# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
fef8d1
-#
46c2f0
+iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
fef8d1
+# 
46c2f0
 # Default if you are not using systemd (uncomment to activate)
46c2f0
 # iscsid.startup = /usr/bin/service start iscsid
fef8d1
 
46c2f0
@@ -41,8 +41,8 @@
46c2f0
 # To request that the iscsi initd scripts startup a session set to "automatic".
46c2f0
 # node.startup = automatic
46c2f0
 #
46c2f0
-# To manually startup the session set to "manual". The default is manual.
46c2f0
-node.startup = manual
46c2f0
+# To manually startup the session set to "manual". The default is automatic.
46c2f0
+node.startup = automatic
46c2f0
 
46c2f0
 # For "automatic" startup nodes, setting this to "Yes" will try logins on each
46c2f0
 # available iface until one succeeds, and then stop.  The default "No" will try
fef8d1
@@ -271,28 +271,27 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
46c2f0
 discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
46c2f0
 
46c2f0
 # To allow the targets to control the setting of the digest checking,
46c2f0
-# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines:
46c2f0
+# with the initiator requesting a preference of enabling the checking, uncomment
46c2f0
+# the following lines (Data digests are not supported.):
46c2f0
 #node.conn[0].iscsi.HeaderDigest = CRC32C,None
46c2f0
-#node.conn[0].iscsi.DataDigest = CRC32C,None
46c2f0
+
46c2f0
 #
46c2f0
 # To allow the targets to control the setting of the digest checking,
46c2f0
 # with the initiator requesting a preference of disabling the checking,
46c2f0
-# uncomment one or both of the following lines:
46c2f0
+# uncomment the following line:
46c2f0
 #node.conn[0].iscsi.HeaderDigest = None,CRC32C
46c2f0
-#node.conn[0].iscsi.DataDigest = None,CRC32C
46c2f0
 #
46c2f0
 # To enable CRC32C digest checking for the header and/or data part of
46c2f0
-# iSCSI PDUs, uncomment one or both of the following lines:
46c2f0
+# iSCSI PDUs, uncomment the following line:
46c2f0
 #node.conn[0].iscsi.HeaderDigest = CRC32C
46c2f0
-#node.conn[0].iscsi.DataDigest = CRC32C
46c2f0
 #
46c2f0
 # To disable digest checking for the header and/or data part of
46c2f0
-# iSCSI PDUs, uncomment one or both of the following lines:
46c2f0
+# iSCSI PDUs, uncomment the following line:
46c2f0
 #node.conn[0].iscsi.HeaderDigest = None
46c2f0
-#node.conn[0].iscsi.DataDigest = None
46c2f0
 #
46c2f0
 # The default is to never use DataDigests or HeaderDigests.
46c2f0
 #
46c2f0
+node.conn[0].iscsi.HeaderDigest = None
46c2f0
 
46c2f0
 # For multipath configurations, you may want more than one session to be
46c2f0
 # created on each iface record.  If node.session.nr_sessions is greater
46c2f0
diff --git a/usr/idbm.c b/usr/idbm.c
fef8d1
index f1e5c88..0f0f17a 100644
46c2f0
--- a/usr/idbm.c
46c2f0
+++ b/usr/idbm.c
fef8d1
@@ -566,9 +566,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
46c2f0
 				 IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
46c2f0
 				 "None,CRC32C", num, 1);
46c2f0
 		sprintf(key, CONN_DATA_DIGEST, i);
46c2f0
+
46c2f0
+#if 0
46c2f0
+We do not support data digests
46c2f0
 		__recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW,
46c2f0
 				 "None", "CRC32C", "CRC32C,None",
46c2f0
 				 "None,CRC32C", num, 1);
46c2f0
+#endif
46c2f0
 		sprintf(key, CONN_IFMARKER, i);
46c2f0
 		__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
46c2f0
 				"No", "Yes", num, 1);
46c2f0
-- 
fef8d1
2.26.2
46c2f0