|
 |
9833c66 |
diff -aurp open-iscsi-2.0-872-rc3-bnx2i/etc/iscsid.conf open-iscsi-2.0-872-rc3-bnx2i.diff/etc/iscsid.conf
|
|
|
9833c66 |
--- open-iscsi-2.0-872-rc3-bnx2i/etc/iscsid.conf 2010-07-11 03:45:50.000000000 -0500
|
|
|
9833c66 |
+++ open-iscsi-2.0-872-rc3-bnx2i.diff/etc/iscsid.conf 2010-07-11 03:57:57.000000000 -0500
|
|
|
11f069b |
@@ -17,10 +17,10 @@
|
|
|
11f069b |
# maintainers.
|
|
|
11f069b |
#
|
|
|
11f069b |
# Default for Fedora and RHEL. (uncomment to activate).
|
|
|
11f069b |
-# iscsid.startup = /etc/rc.d/init.d/iscsid force-start
|
|
|
11f069b |
+iscsid.startup = /etc/rc.d/init.d/iscsid force-start
|
|
|
11f069b |
#
|
|
|
11f069b |
# Default for upstream open-iscsi scripts (uncomment to activate).
|
|
|
11f069b |
-iscsid.startup = /sbin/iscsid
|
|
|
11f069b |
+# iscsid.startup = /sbin/iscsid
|
|
|
11f069b |
|
|
|
11f069b |
|
|
|
9833c66 |
#############################
|
|
|
9833c66 |
@@ -36,8 +36,8 @@ iscsid.startup = /sbin/iscsid
|
|
|
11f069b |
# To request that the iscsi initd scripts startup a session set to "automatic".
|
|
|
11f069b |
# node.startup = automatic
|
|
|
11f069b |
#
|
|
|
11f069b |
-# To manually startup the session set to "manual". The default is manual.
|
|
|
11f069b |
-node.startup = manual
|
|
|
11f069b |
+# To manually startup the session set to "manual". The default is automatic.
|
|
|
11f069b |
+node.startup = automatic
|
|
|
11f069b |
|
|
|
11f069b |
|
|
|
11f069b |
# *************
|
|
|
9833c66 |
@@ -255,29 +255,26 @@ node.conn[0].iscsi.MaxXmitDataSegmentLen
|
|
|
11f069b |
discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
|
|
|
11f069b |
|
|
|
11f069b |
# To allow the targets to control the setting of the digest checking,
|
|
|
11f069b |
-# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines:
|
|
|
11f069b |
+# with the initiator requesting a preference of enabling the checking, uncomment
|
|
|
11f069b |
+# the following lines (Data digests are not supported.):
|
|
|
11f069b |
#node.conn[0].iscsi.HeaderDigest = CRC32C,None
|
|
|
11f069b |
-#node.conn[0].iscsi.DataDigest = CRC32C,None
|
|
|
11f069b |
#
|
|
|
11f069b |
# To allow the targets to control the setting of the digest checking,
|
|
|
11f069b |
# with the initiator requesting a preference of disabling the checking,
|
|
|
11f069b |
-# uncomment one or both of the following lines:
|
|
|
11f069b |
+# uncomment the following lines:
|
|
|
11f069b |
#node.conn[0].iscsi.HeaderDigest = None,CRC32C
|
|
|
11f069b |
-#node.conn[0].iscsi.DataDigest = None,CRC32C
|
|
|
11f069b |
#
|
|
|
11f069b |
# To enable CRC32C digest checking for the header and/or data part of
|
|
|
11f069b |
-# iSCSI PDUs, uncomment one or both of the following lines:
|
|
|
11f069b |
+# iSCSI PDUs, uncomment the following lines:
|
|
|
11f069b |
#node.conn[0].iscsi.HeaderDigest = CRC32C
|
|
|
11f069b |
-#node.conn[0].iscsi.DataDigest = CRC32C
|
|
|
11f069b |
#
|
|
|
11f069b |
# To disable digest checking for the header and/or data part of
|
|
|
11f069b |
-# iSCSI PDUs, uncomment one or both of the following lines:
|
|
|
11f069b |
+# iSCSI PDUs, uncomment the following lines:
|
|
|
11f069b |
#node.conn[0].iscsi.HeaderDigest = None
|
|
|
11f069b |
-#node.conn[0].iscsi.DataDigest = None
|
|
|
11f069b |
#
|
|
|
11f069b |
# The default is to never use DataDigests or HeaderDigests.
|
|
|
11f069b |
#
|
|
|
11f069b |
-
|
|
|
11f069b |
+node.conn[0].iscsi.HeaderDigest = None
|
|
|
11f069b |
|
|
|
11f069b |
#************
|
|
|
11f069b |
# Workarounds
|
|
|
9833c66 |
diff -aurp open-iscsi-2.0-872-rc3-bnx2i/README open-iscsi-2.0-872-rc3-bnx2i.diff/README
|
|
|
9833c66 |
--- open-iscsi-2.0-872-rc3-bnx2i/README 2010-07-11 03:45:50.000000000 -0500
|
|
|
9833c66 |
+++ open-iscsi-2.0-872-rc3-bnx2i.diff/README 2010-07-11 03:57:57.000000000 -0500
|
|
|
9833c66 |
@@ -74,11 +74,6 @@ the cache sync command will fail.
|
|
|
9833c66 |
- iscsiadm's -P 3 option will not print out scsi devices.
|
|
|
9833c66 |
- iscsid will not automatically online devices.
|
|
|
9833c66 |
|
|
|
9833c66 |
-You need to enable "Cryptographic API" under "Cryptographic options" in the
|
|
|
9833c66 |
-kernel config. And you must enable "CRC32c CRC algorithm" even if
|
|
|
9833c66 |
-you do not use header or data digests. They are the kernel options,
|
|
|
9833c66 |
-CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively.
|
|
|
9833c66 |
-
|
|
|
9833c66 |
By default the kernel source found at
|
|
|
9833c66 |
/lib/modules/`uname -a`/build
|
|
|
9833c66 |
will be used to compile the open-iscsi modules. To specify a different
|
|
|
9833c66 |
@@ -907,7 +902,7 @@ Red Hat or Fedora:
|
|
|
9833c66 |
-----------------
|
|
|
9833c66 |
To start open-iscsi in Red Hat/Fedora you can do:
|
|
|
9833c66 |
|
|
|
9833c66 |
- service open-iscsi start
|
|
|
9833c66 |
+ service iscsi start
|
|
|
9833c66 |
|
|
|
9833c66 |
To get open-iscsi to automatically start at run time you may have to
|
|
|
9833c66 |
run:
|
|
|
9833c66 |
@@ -1115,6 +1110,8 @@ iscsid will only perform rediscovery whe
|
|
|
9833c66 |
# linux-isns (SLES's iSNS server) where it sometimes does not send SCN
|
|
|
9833c66 |
# events in the proper format, so they may not get handled.
|
|
|
9833c66 |
|
|
|
9833c66 |
+To set the startup value, so that nodes are not logged into automatically
|
|
|
9833c66 |
+use the value "manual".
|
|
|
9833c66 |
|
|
|
9833c66 |
Example:
|
|
|
9833c66 |
--------
|
|
|
9833c66 |
Only in open-iscsi-2.0-872-rc3-bnx2i.diff/: README.orig
|
|
|
9833c66 |
diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c
|
|
|
9833c66 |
--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c 2010-07-11 03:45:50.000000000 -0500
|
|
|
9833c66 |
+++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c 2010-07-11 03:57:57.000000000 -0500
|
|
|
9833c66 |
@@ -346,9 +346,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo
|
|
|
11f069b |
IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
|
|
|
11f069b |
"None,CRC32C", num, 1);
|
|
|
11f069b |
sprintf(key, CONN_DATA_DIGEST, i);
|
|
|
11f069b |
+
|
|
|
11f069b |
+#if 0
|
|
|
11f069b |
+We do not support data digests
|
|
|
11f069b |
__recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW,
|
|
|
11f069b |
"None", "CRC32C", "CRC32C,None",
|
|
|
11f069b |
"None,CRC32C", num, 1);
|
|
|
11f069b |
+#endif
|
|
|
11f069b |
sprintf(key, CONN_IFMARKER, i);
|
|
|
11f069b |
__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
|
|
|
11f069b |
"No", "Yes", num, 1);
|