1 diff -aurp open-iscsi-2.0-872-rc3-bnx2i/doc/iscsiadm.8 open-iscsi-2.0-872-rc3-bnx2i.diff/doc/iscsiadm.8
2 --- open-iscsi-2.0-872-rc3-bnx2i/doc/iscsiadm.8 2010-07-11 03:45:50.000000000 -0500
3 +++ open-iscsi-2.0-872-rc3-bnx2i.diff/doc/iscsiadm.8 2010-07-11 04:00:35.000000000 -0500
4 @@ -51,7 +51,7 @@ display help text and exit
6 \fB\-I\fR, \fB\-\-interface\fI[iface]\fR
7 The interface argument specifies the iSCSI interface to use for the operation.
8 -iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware
9 +iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware
10 iSCSI (qla4xxx) the iface config must have the hardware address
11 (iface.hwaddress = port's MAC address)
12 and the driver/transport_name (iface.transport_name). The iface's name is
13 @@ -128,7 +128,7 @@ If no other options are specified: for \
14 of their respective records are displayed; for \fIsession\fR, all active
15 sessions and connections are displayed; for \fIfw\fR, all boot firmware
16 values are displayed; for \fIhost\fR, all iSCSI hosts are displayed; and
17 -for \fIiface\fR, all ifaces setup in /etc/iscsi/ifaces are displayed.
18 +for \fIiface\fR, all ifaces setup in /var/lib/iscsi/ifaces are displayed.
21 \fB\-n\fR, \fB\-\-name=\fIname\fR
22 @@ -336,10 +336,10 @@ The configuration file read by \fBiscsid
23 The file containing the iSCSI InitiatorName and InitiatorAlias read by
24 \fBiscsid\fR and \fBiscsiadm\fR on startup.
27 +/var/lib/iscsi/nodes/
28 This directory contains the nodes with their targets.
30 -/etc/iscsi/send_targets
31 +/var/lib/iscsi/send_targets
32 This directory contains the portals.
35 Only in open-iscsi-2.0-872-rc3-bnx2i.diff/doc: iscsiadm.8.orig
36 diff -aurp open-iscsi-2.0-872-rc3-bnx2i/README open-iscsi-2.0-872-rc3-bnx2i.diff/README
37 --- open-iscsi-2.0-872-rc3-bnx2i/README 2010-07-11 03:58:50.000000000 -0500
38 +++ open-iscsi-2.0-872-rc3-bnx2i.diff/README 2010-07-11 03:59:00.000000000 -0500
39 @@ -144,10 +144,10 @@ available on all Linux installations.
41 The database contains two tables:
43 -- Discovery table (/etc/iscsi/send_targets);
44 -- Node table (/etc/iscsi/nodes).
45 +- Discovery table (/var/lib/iscsi/send_targets);
46 +- Node table (/var/lib/iscsi/nodes).
48 -The regular place for iSCSI database files: /etc/iscsi/nodes
49 +The regular place for iSCSI database files: /var/lib/iscsi/nodes
51 The iscsiadm utility is a command-line tool to manage (update, delete,
52 insert, query) the persistent database.
53 @@ -420,7 +420,7 @@ a scsi_host per HBA port).
54 To manage both types of initiator stacks, iscsiadm uses the interface (iface)
55 structure. For each HBA port or for software iscsi for each network
56 device (ethX) or NIC, that you wish to bind sessions to you must create
57 -a iface config /etc/iscsi/ifaces.
58 +a iface config /var/lib/iscsi/ifaces.
62 @@ -428,29 +428,29 @@ Running:
63 iface0 qla4xxx,00:c0:dd:08:63:e8,20.15.0.7,default,iqn.2005-06.com.redhat:madmax
64 iface1 qla4xxx,00:c0:dd:08:63:ea,20.15.0.9,default,iqn.2005-06.com.redhat:madmax
66 -Will report iface configurations that are setup in /etc/iscsi/ifaces.
67 +Will report iface configurations that are setup in /var/lib/iscsi/ifaces.
70 iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname
72 For software iscsi, you can create the iface configs by hand, but it is
73 reccomended that you use iscsiadm's iface mode. There is a iface.example in
74 -/etc/iscsi/ifaces which can be used as a template for the daring.
75 +/var/lib/iscsi/ifaces which can be used as a template for the daring.
77 For each network object you wish to bind a session to you must create
78 -a seperate iface config in /etc/iscsi/ifaces and each iface config file
79 +a seperate iface config in /var/lib/iscsi/ifaces and each iface config file
80 must have a unique name which is less than or equal to 64 characters.
84 If you have NIC1 with MAC address 00:0F:1F:92:6B:BF and NIC2 with
85 MAC address 00:C0:DD:08:63:E7 and you wanted to do software iscsi over
86 -TCP/IP. Then in /etc/iscsi/ifaces/iface0 you would enter:
87 +TCP/IP. Then in /var/lib/iscsi/ifaces/iface0 you would enter:
89 iface.transport_name = tcp
90 iface.hwaddress = 00:0F:1F:92:6B:BF
92 -and in /etc/iscsi/ifaces/iface1 you would enter:
93 +and in /var/lib/iscsi/ifaces/iface1 you would enter:
95 iface.transport_name = tcp
96 iface.hwaddress = 00:C0:DD:08:63:E7
97 @@ -499,7 +499,7 @@ iser iser,<empty>,<empty>,<empty>,<empty
98 cxgb3i.00:07:43:05:97:07 cxgb3i,00:07:43:05:97:07,<empty>,<empty>,<empty>
101 -Will report iface configurations that are setup in /etc/iscsi/ifaces.
102 +Will report iface configurations that are setup in /var/lib/iscsi/ifaces.
105 iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname
106 @@ -515,7 +515,7 @@ default one in /etc/iscsi/initiatorname.
110 -To display these values in a more friendly run:
111 +To display these values in a more friendly way run:
113 iscsiadm -m iface -I cxgb3i.00:07:43:05:97:07
114 # BEGIN RECORD 2.0-871
115 @@ -553,7 +553,7 @@ need a seperate network connection to th
116 *This will be fixed in the next version of open-iscsi*
118 For compatibility reasons, when you run iscsiadm to do discovery, it
119 -will check for interfaces in /etc/iscsi/iscsi/ifaces that are using
120 +will check for interfaces in /var/lib/iscsi/ifaces that are using
121 tcp for the iface.transport and it will bind the portals that are discovered
122 so that they will be logged in through those ifaces. This behavior can also
123 be overriden by passing in the interfaces you want to use. For the case
124 @@ -571,7 +571,7 @@ we do not bind a session to a iface, the
126 iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1
128 -And if you did not define any interfaces in /etc/iscsi/ifaces and do
129 +And if you did not define any interfaces in /var/lib/iscsi/ifaces and do
130 not pass anything into iscsiadm, running iscsiadm will do the default
131 behavior, where we allow the network subsystem to decide which
133 @@ -613,13 +613,13 @@ To now log into targets it is the same a
135 ./iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover
137 - This will search /etc/iscsi/send_targets for a record with the
138 + This will search /var/lib/iscsi/send_targets for a record with the
139 ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it
140 will perform discovery using the settings stored in the record.
141 If a record does not exist, it will be created using the iscsid.conf
144 - For the ifaces, iscsiadm will first search /etc/iscsi/ifaces for
145 + For the ifaces, iscsiadm will first search /var/lib/iscsi/ifaces for
146 interfaces using software iscsi. If any are found then nodes found
147 during discovery will be setup so that they can logged in through
148 those interfaces. To specify a specific iface, pass the
149 @@ -675,7 +675,7 @@ To now log into targets it is the same a
150 This command will perform discovery, but not manipulate the node DB.
152 - SendTargets iSCSI Discovery with a specific interface. If you
153 - wish to only use a subset of the interfaces in /etc/iscsi/ifaces
154 + wish to only use a subset of the interfaces in /var/lib/iscsi/ifaces
155 then you can pass them in during discovery:
157 ./iscsiadm -m discoverydb -t sendtargets -p 192.168.1.1:3260 \
158 @@ -982,8 +982,8 @@ where targetname is the name of the targ
159 and port of the portal. tpgt, is the portal group tag of
160 the portal, and is not used in iscsiadm commands except for static
161 record creation. And iface name is the name of the iscsi interface
162 -defined in /etc/iscsi/ifaces. If no interface was defined in
163 -/etc/iscsi/ifaces or passed in, the default behavior is used.
164 +defined in /var/lib/iscsi/ifaces. If no interface was defined in
165 +/var/lib/iscsi/ifaces or passed in, the default behavior is used.
166 Default here is iscsi_tcp/tcp to be used over which ever NIC the
167 network layer decides is best.
169 @@ -1098,7 +1098,7 @@ If set, iscsid will perform discovery to
170 discovery.isns.discoveryd_poll_inval or
171 discovery.sendtargets.discoveryd_poll_inval seconds,
172 and it will log into any portals found from the discovery source using
173 -the ifaces in /etc/iscsi/ifaces.
174 +the ifaces in /var/lib/iscsi/ifaces.
176 Note that for iSNS the poll_interval does not have to be set. If not set,
177 iscsid will only perform rediscovery when it gets a SCN from the server.
178 Only in open-iscsi-2.0-872-rc3-bnx2i.diff/: README.orig
179 diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c
180 --- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c 2010-07-11 03:58:50.000000000 -0500
181 +++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c 2010-07-11 03:59:00.000000000 -0500
182 @@ -2235,9 +2235,9 @@ free_info:
183 int idbm_init(idbm_get_config_file_fn *fn)
185 /* make sure root db dir is there */
186 - if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
187 - if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
188 - log_error("Could not make %s %d\n", ISCSI_CONFIG_ROOT,
189 + if (access(ISCSIVAR, F_OK) != 0) {
190 + if (mkdir(ISCSIVAR, 0660) != 0) {
191 + log_error("Could not make %s %d\n", ISCSIVAR,
195 Only in open-iscsi-2.0-872-rc3-bnx2i.diff/usr: idbm.c.orig
196 diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.h
197 --- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.h 2010-07-11 03:45:50.000000000 -0500
198 +++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.h 2010-07-11 03:59:00.000000000 -0500
200 #include "initiator.h"
203 -#define NODE_CONFIG_DIR ISCSI_CONFIG_ROOT"nodes"
204 -#define SLP_CONFIG_DIR ISCSI_CONFIG_ROOT"slp"
205 -#define ISNS_CONFIG_DIR ISCSI_CONFIG_ROOT"isns"
206 -#define STATIC_CONFIG_DIR ISCSI_CONFIG_ROOT"static"
207 -#define FW_CONFIG_DIR ISCSI_CONFIG_ROOT"fw"
208 -#define ST_CONFIG_DIR ISCSI_CONFIG_ROOT"send_targets"
209 +#define ISCSIVAR "/var/lib/iscsi/"
211 +#define NODE_CONFIG_DIR ISCSIVAR"nodes"
212 +#define SLP_CONFIG_DIR ISCSIVAR"slp"
213 +#define ISNS_CONFIG_DIR ISCSIVAR"isns"
214 +#define STATIC_CONFIG_DIR ISCSIVAR"static"
215 +#define ST_CONFIG_DIR ISCSIVAR"send_targets"
216 +#define FW_CONFIG_DIR ISCSIVAR"fw"
218 #define ST_CONFIG_NAME "st_config"
219 #define ISNS_CONFIG_NAME "isns_config"
221 diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/iface.h open-iscsi-2.0-872-rc3-bnx2i.diff/usr/iface.h
222 --- open-iscsi-2.0-872-rc3-bnx2i/usr/iface.h 2010-07-11 03:45:50.000000000 -0500
223 +++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/iface.h 2010-07-11 03:59:00.000000000 -0500
225 #ifndef ISCSI_IFACE_H
226 #define ISCSI_IFACE_H
228 -#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces"
231 +#define IFACE_CONFIG_DIR ISCSIVAR"ifaces"