]>
Commit | Line | Data |
---|---|---|
3de50fc5 JB |
1 | From 97b1242450df25648d203acf7cc297cd46d10e8c Mon Sep 17 00:00:00 2001 |
2 | From: Chris Leech <cleech@redhat.com> | |
3 | Date: Mon, 19 Nov 2012 16:37:13 -0800 | |
4 | Subject: [PATCH] update initscripts and docs | |
5 | ||
6 | --- | |
7 | README | 12 +++++------- | |
8 | etc/iscsid.conf | 23 +++++++++++------------ | |
9 | usr/idbm.c | 4 ++++ | |
10 | 3 files changed, 20 insertions(+), 19 deletions(-) | |
11 | ||
12 | diff --git a/README b/README | |
13 | index 508c9d7..b62a14e 100644 | |
14 | --- a/README | |
15 | +++ b/README | |
16 | @@ -77,11 +77,6 @@ the cache sync command will fail. | |
17 | - iscsiadm's -P 3 option will not print out scsi devices. | |
18 | - iscsid will not automatically online devices. | |
19 | ||
20 | -You need to enable "Cryptographic API" under "Cryptographic options" in the | |
21 | -kernel config. And you must enable "CRC32c CRC algorithm" even if | |
22 | -you do not use header or data digests. They are the kernel options | |
23 | -CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively. | |
24 | - | |
25 | The userspace components iscsid, iscsiadm and iscsistart require the | |
26 | open-isns library, which can be found here: | |
27 | https://github.com/gonzoleeman/open-isns/releases | |
28 | @@ -1163,11 +1158,11 @@ Red Hat or Fedora: | |
29 | ----------------- | |
30 | To start open-iscsi in Red Hat/Fedora you can do: | |
31 | ||
32 | - systemctl start open-iscsi | |
33 | + systemctl start iscsi | |
34 | ||
35 | To get open-iscsi to automatically start at run time you may have to | |
36 | run: | |
37 | - systemctl enable open-iscsi | |
38 | + systemctl enable iscsi | |
39 | ||
40 | And, to automatically mount a file system during startup | |
41 | you must have the partition entry in /etc/fstab marked with the "_netdev" | |
42 | @@ -1370,6 +1365,9 @@ iscsid will only perform rediscovery when it gets a SCN from the server. | |
43 | # linux-isns (SLES's iSNS server) where it sometimes does not send SCN | |
44 | # events in the proper format, so they may not get handled. | |
45 | ||
46 | +To set the startup value, so that nodes are not logged into automatically | |
47 | +use the value "manual". | |
48 | + | |
49 | Examples | |
50 | -------- | |
51 | ||
52 | diff --git a/etc/iscsid.conf b/etc/iscsid.conf | |
53 | index f21ed3d..420145b 100644 | |
54 | --- a/etc/iscsid.conf | |
55 | +++ b/etc/iscsid.conf | |
e621921b | 56 | @@ -19,7 +19,7 @@ |
3de50fc5 JB |
57 | # the time then leave this attribute commented out. |
58 | # | |
e621921b | 59 | # Default for Fedora and RHEL. Uncomment to activate. |
3de50fc5 | 60 | -# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket |
3de50fc5 | 61 | +iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket |
e621921b JB |
62 | # |
63 | # Default for Debian and Ubuntu. Uncomment to activate. | |
64 | # iscsid.startup = /bin/systemctl start iscsid.socket | |
65 | @@ -42,10 +42,10 @@ | |
66 | #***************** | |
3de50fc5 | 67 | |
e621921b JB |
68 | # To request that the iscsi service scripts startup a session, use "automatic": |
69 | -# node.startup = automatic | |
70 | +node.startup = automatic | |
3de50fc5 | 71 | # |
e621921b | 72 | # To manually startup the session, use "manual". The default is manual. |
3de50fc5 | 73 | -node.startup = manual |
e621921b | 74 | +# node.startup = manual |
3de50fc5 JB |
75 | |
76 | # For "automatic" startup nodes, setting this to "Yes" will try logins on each | |
77 | # available iface until one succeeds, and then stop. The default "No" will try | |
e621921b | 78 | @@ -279,28 +279,25 @@ discovery.sendtargets.iscsi.MaxRecvDataS |
3de50fc5 JB |
79 | |
80 | # To allow the targets to control the setting of the digest checking, | |
e621921b JB |
81 | # with the initiator requesting a preference of enabling the checking, |
82 | -# uncomment one or both of the following lines: | |
83 | +# uncomment the following line (Data digests are not supported.): | |
3de50fc5 JB |
84 | #node.conn[0].iscsi.HeaderDigest = CRC32C,None |
85 | -#node.conn[0].iscsi.DataDigest = CRC32C,None | |
3de50fc5 JB |
86 | # |
87 | # To allow the targets to control the setting of the digest checking, | |
88 | # with the initiator requesting a preference of disabling the checking, | |
89 | -# uncomment one or both of the following lines: | |
90 | +# uncomment the following line: | |
91 | #node.conn[0].iscsi.HeaderDigest = None,CRC32C | |
92 | -#node.conn[0].iscsi.DataDigest = None,CRC32C | |
93 | # | |
94 | # To enable CRC32C digest checking for the header and/or data part of | |
95 | -# iSCSI PDUs, uncomment one or both of the following lines: | |
96 | +# iSCSI PDUs, uncomment the following line: | |
97 | #node.conn[0].iscsi.HeaderDigest = CRC32C | |
98 | -#node.conn[0].iscsi.DataDigest = CRC32C | |
99 | # | |
100 | # To disable digest checking for the header and/or data part of | |
101 | -# iSCSI PDUs, uncomment one or both of the following lines: | |
102 | +# iSCSI PDUs, uncomment the following line: | |
103 | #node.conn[0].iscsi.HeaderDigest = None | |
104 | -#node.conn[0].iscsi.DataDigest = None | |
105 | # | |
106 | # The default is to never use DataDigests or HeaderDigests. | |
107 | # | |
108 | +node.conn[0].iscsi.HeaderDigest = None | |
109 | ||
110 | # For multipath configurations, you may want more than one session to be | |
e621921b | 111 | # created on each iface record. If node.session.nr_sessions is greater |
3de50fc5 JB |
112 | diff --git a/usr/idbm.c b/usr/idbm.c |
113 | index f1e5c88..0f0f17a 100644 | |
114 | --- a/usr/idbm.c | |
115 | +++ b/usr/idbm.c | |
116 | @@ -566,9 +566,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri) | |
117 | IDBM_SHOW, "None", "CRC32C", "CRC32C,None", | |
118 | "None,CRC32C", num, 1); | |
119 | sprintf(key, CONN_DATA_DIGEST, i); | |
120 | + | |
121 | +#if 0 | |
122 | +We do not support data digests | |
123 | __recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW, | |
124 | "None", "CRC32C", "CRC32C,None", | |
125 | "None,CRC32C", num, 1); | |
126 | +#endif | |
127 | sprintf(key, CONN_IFMARKER, i); | |
128 | __recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW, | |
129 | "No", "Yes", num, 1); | |
130 | -- | |
131 | 2.26.2 | |
132 |