You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
130 lines
4.9 KiB
130 lines
4.9 KiB
From 714a9dbed8e4c9d943ce34896a58d48a174f54cb Mon Sep 17 00:00:00 2001 |
|
From: Chris Leech <cleech@redhat.com> |
|
Date: Mon, 19 Nov 2012 16:37:13 -0800 |
|
Subject: [PATCH] update initscripts and docs |
|
|
|
--- |
|
README | 9 +++------ |
|
etc/iscsid.conf | 23 +++++++++++------------ |
|
usr/idbm.c | 4 ++++ |
|
3 files changed, 18 insertions(+), 18 deletions(-) |
|
|
|
diff --git a/README b/README |
|
index cbe8763..8db3013 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. |
|
- |
|
The userspace components: iscsid, iscsiadm and iscsistart require the |
|
open-isns library which can be found here: |
|
|
|
@@ -1132,7 +1127,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: |
|
@@ -1340,6 +1335,8 @@ iscsid will only perform rediscovery when it gets a SCN from the server. |
|
# linux-isns (SLES's iSNS server) where it sometimes does not send SCN |
|
# events in the proper format, so they may not get handled. |
|
|
|
+To set the startup value, so that nodes are not logged into automatically |
|
+use the value "manual". |
|
|
|
Example: |
|
-------- |
|
diff --git a/etc/iscsid.conf b/etc/iscsid.conf |
|
index c30a7dc..cfa6844 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 |
|
|
|
# Check for active mounts on devices reachable through a session |
|
# and refuse to logout if there are any. Defaults to "No". |
|
@@ -39,8 +39,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 |
|
|
|
# For "automatic" startup nodes, setting this to "Yes" will try logins on each |
|
# available iface until one succeeds, and then stop. The default "No" will try |
|
@@ -262,28 +262,27 @@ 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 line: |
|
#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 line: |
|
#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 line: |
|
#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 |
|
|
|
# For multipath configurations, you may want more than one session to be |
|
# created on each iface record. If node.session.nr_sessions is greater |
|
diff --git a/usr/idbm.c b/usr/idbm.c |
|
index 198a5ef..2d64172 100644 |
|
--- a/usr/idbm.c |
|
+++ b/usr/idbm.c |
|
@@ -509,9 +509,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); |
|
-- |
|
2.5.5 |
|
|
|
|