1c8eda
diff -aurp open-iscsi-2.0-872-rc3-bnx2i/doc/iscsiadm.8 open-iscsi-2.0-872-rc3-bnx2i.diff/doc/iscsiadm.8
1c8eda
--- open-iscsi-2.0-872-rc3-bnx2i/doc/iscsiadm.8	2010-07-11 03:45:50.000000000 -0500
1c8eda
+++ open-iscsi-2.0-872-rc3-bnx2i.diff/doc/iscsiadm.8	2010-07-11 04:00:35.000000000 -0500
1c8eda
@@ -51,7 +51,7 @@ display help text and exit
1c8eda
 .TP
1c8eda
 \fB\-I\fR, \fB\-\-interface\fI[iface]\fR
1c8eda
 The interface argument specifies the iSCSI interface to use for the operation.
1c8eda
-iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware
1c8eda
+iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware
1c8eda
 iSCSI (qla4xxx) the iface config must have the hardware address
1c8eda
 (iface.hwaddress = port's MAC address)
1c8eda
 and the driver/transport_name (iface.transport_name). The iface's name is
1c8eda
@@ -128,7 +128,7 @@ If no other options are specified: for \
1c8eda
 of their respective records are displayed; for \fIsession\fR, all active
1c8eda
 sessions and connections are displayed; for \fIfw\fR, all boot firmware
1c8eda
 values are displayed; for \fIhost\fR, all iSCSI hosts are displayed; and
1c8eda
-for \fIiface\fR, all ifaces setup in /etc/iscsi/ifaces are displayed.
1c8eda
+for \fIiface\fR, all ifaces setup in /var/lib/iscsi/ifaces are displayed.
1c8eda
 
1c8eda
 .TP
1c8eda
 \fB\-n\fR, \fB\-\-name=\fIname\fR
1c8eda
@@ -336,10 +336,10 @@ The configuration file read by \fBiscsid
1c8eda
 The file containing the iSCSI InitiatorName and InitiatorAlias read by
1c8eda
 \fBiscsid\fR and \fBiscsiadm\fR on startup.
1c8eda
 .TP
1c8eda
-/etc/iscsi/nodes/
1c8eda
+/var/lib/iscsi/nodes/
1c8eda
 This directory contains the nodes with their targets.
1c8eda
 .TP
1c8eda
-/etc/iscsi/send_targets
1c8eda
+/var/lib/iscsi/send_targets
1c8eda
 This directory contains the portals.
1c8eda
 
1c8eda
 .SH "SEE ALSO"
1c8eda
Only in open-iscsi-2.0-872-rc3-bnx2i.diff/doc: iscsiadm.8.orig
1c8eda
diff -aurp open-iscsi-2.0-872-rc3-bnx2i/README open-iscsi-2.0-872-rc3-bnx2i.diff/README
1c8eda
--- open-iscsi-2.0-872-rc3-bnx2i/README	2010-07-11 03:58:50.000000000 -0500
1c8eda
+++ open-iscsi-2.0-872-rc3-bnx2i.diff/README	2010-07-11 03:59:00.000000000 -0500
5ebdd5
@@ -144,10 +144,10 @@ available on all Linux installations.
5a3872
 
5a3872
 The database contains two tables:
5a3872
 
5a3872
-- Discovery table (/etc/iscsi/send_targets);
5a3872
-- Node table (/etc/iscsi/nodes).
5a3872
+- Discovery table (/var/lib/iscsi/send_targets);
5a3872
+- Node table (/var/lib/iscsi/nodes).
5a3872
 
5a3872
-The regular place for iSCSI database files: /etc/iscsi/nodes
5a3872
+The regular place for iSCSI database files: /var/lib/iscsi/nodes
5a3872
 
5a3872
 The iscsiadm utility is a command-line tool to manage (update, delete,
5a3872
 insert, query) the persistent database.
1c8eda
@@ -420,7 +420,7 @@ a scsi_host per HBA port).
5a3872
 To manage both types of initiator stacks, iscsiadm uses the interface (iface)
5a3872
 structure. For each HBA port or for software iscsi for each network
5a3872
 device (ethX) or NIC, that you wish to bind sessions to you must create
5a3872
-a iface config /etc/iscsi/ifaces.
5a3872
+a iface config /var/lib/iscsi/ifaces.
5a3872
 
5ebdd5
 Running:
5ebdd5
 
1c8eda
@@ -428,29 +428,29 @@ Running:
5ebdd5
 iface0 qla4xxx,00:c0:dd:08:63:e8,20.15.0.7,default,iqn.2005-06.com.redhat:madmax
5ebdd5
 iface1 qla4xxx,00:c0:dd:08:63:ea,20.15.0.9,default,iqn.2005-06.com.redhat:madmax
5a3872
 
5a3872
-Will report iface configurations that are setup in /etc/iscsi/ifaces.
5a3872
+Will report iface configurations that are setup in /var/lib/iscsi/ifaces.
5a3872
 The format is:
5a3872
 
5ebdd5
 iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname
5a3872
 
5a3872
 For software iscsi, you can create the iface configs by hand, but it is
5a3872
 reccomended that you use iscsiadm's iface mode. There is a iface.example in
5a3872
-/etc/iscsi/ifaces which can be used as a template for the daring.
5a3872
+/var/lib/iscsi/ifaces which can be used as a template for the daring.
5a3872
 
5a3872
 For each network object you wish to bind a session to you must create
5a3872
-a seperate iface config in /etc/iscsi/ifaces and each iface config file
5a3872
+a seperate iface config in /var/lib/iscsi/ifaces and each iface config file
5a3872
 must have a unique name which is less than or equal to 64 characters.
5a3872
 
5a3872
 Example:
5a3872
 
5a3872
 If you have NIC1 with MAC address 00:0F:1F:92:6B:BF and NIC2 with
5a3872
 MAC address 00:C0:DD:08:63:E7 and you wanted to do software iscsi over
5a3872
-TCP/IP. Then in /etc/iscsi/ifaces/iface0 you would enter:
5a3872
+TCP/IP. Then in /var/lib/iscsi/ifaces/iface0 you would enter:
5a3872
 
5a3872
 iface.transport_name = tcp
5a3872
 iface.hwaddress = 00:0F:1F:92:6B:BF
5a3872
 
5a3872
-and in /etc/iscsi/ifaces/iface1 you would enter:
5a3872
+and in /var/lib/iscsi/ifaces/iface1 you would enter:
5a3872
 
5a3872
 iface.transport_name = tcp
5a3872
 iface.hwaddress = 00:C0:DD:08:63:E7
1c8eda
@@ -499,7 +499,7 @@ iser iser,<empty>,<empty>,<empty>,
5ebdd5
 cxgb3i.00:07:43:05:97:07 cxgb3i,00:07:43:05:97:07,<empty>,<empty>,<empty>
5ebdd5
 
5ebdd5
 
5ebdd5
-Will report iface configurations that are setup in /etc/iscsi/ifaces.
5ebdd5
+Will report iface configurations that are setup in /var/lib/iscsi/ifaces.
5ebdd5
 The format is:
5a3872
 
5ebdd5
 iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname
1c8eda
@@ -515,7 +515,7 @@ default one in /etc/iscsi/initiatorname.
5ebdd5
 
5ebdd5
 
5ebdd5
 
5ebdd5
-To display these values in a more friendly run:
5ebdd5
+To display these values in a more friendly way run:
5ebdd5
 
5ebdd5
 iscsiadm -m iface -I cxgb3i.00:07:43:05:97:07
5ebdd5
 # BEGIN RECORD 2.0-871
1c8eda
@@ -553,7 +553,7 @@ need a seperate network connection to th
5ebdd5
 *This will be fixed in the next version of open-iscsi*
5ebdd5
 
5ebdd5
 For compatibility reasons, when you run iscsiadm to do discovery, it
5ebdd5
-will check for interfaces in /etc/iscsi/iscsi/ifaces that are using
5ebdd5
+will check for interfaces in /var/lib/iscsi/ifaces that are using
5ebdd5
 tcp for the iface.transport and it will bind the portals that are discovered
5ebdd5
 so that they will be logged in through those ifaces. This behavior can also
5ebdd5
 be overriden by passing in the interfaces you want to use. For the case
1c8eda
@@ -571,7 +571,7 @@ we do not bind a session to a iface, the
5a3872
 
1c8eda
 iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1
5a3872
 
5a3872
-And if you did not define any interfaces in /etc/iscsi/ifaces and do
5a3872
+And if you did not define any interfaces in /var/lib/iscsi/ifaces and do
5a3872
 not pass anything into iscsiadm, running iscsiadm will do the default
5a3872
 behavior, where we allow the network subsystem to decide which
5a3872
 device to use.
1c8eda
@@ -613,13 +613,13 @@ To now log into targets it is the same a
1c8eda
 
1c8eda
 	    ./iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover
1c8eda
 
1c8eda
-	This will search /etc/iscsi/send_targets for a record with the
1c8eda
+	This will search /var/lib/iscsi/send_targets for a record with the
1c8eda
 	ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it
1c8eda
 	will perform discovery using the settings stored in the record.
1c8eda
 	If a record does not exist, it will be created using the iscsid.conf
1c8eda
 	discovery settings.
1c8eda
 
1c8eda
-	For the ifaces, iscsiadm will first search /etc/iscsi/ifaces for
1c8eda
+	For the ifaces, iscsiadm will first search /var/lib/iscsi/ifaces for
1c8eda
 	interfaces using software iscsi. If any are found then nodes found
1c8eda
 	during discovery will be setup so that they can logged in through
1c8eda
 	those interfaces. To specify a specific iface, pass the
1c8eda
@@ -675,7 +675,7 @@ To now log into targets it is the same a
5ebdd5
 	This command will perform discovery, but not manipulate the node DB.
5a3872
 
a4c8b3
   - SendTargets iSCSI Discovery with a specific interface. If you
5a3872
-	wish to only use a subset of the interfaces in /etc/iscsi/ifaces
5a3872
+	wish to only use a subset of the interfaces in /var/lib/iscsi/ifaces
5a3872
 	then you can pass them in during discovery:
5a3872
 
1c8eda
 	     ./iscsiadm -m discoverydb -t sendtargets -p 192.168.1.1:3260 \
1c8eda
@@ -982,8 +982,8 @@ where targetname is the name of the targ
a4c8b3
 and port of the portal. tpgt, is the portal group tag of
a4c8b3
 the portal, and is not used in iscsiadm commands except for static
a4c8b3
 record creation. And iface name is the name of the iscsi interface
a4c8b3
-defined in /etc/iscsi/ifaces. If no interface was defined in
a4c8b3
-/etc/iscsi/ifaces or passed in, the default behavior is used.
a4c8b3
+defined in /var/lib/iscsi/ifaces. If no interface was defined in
a4c8b3
+/var/lib/iscsi/ifaces or passed in, the default behavior is used.
a4c8b3
 Default here is iscsi_tcp/tcp to be used over which ever NIC the
a4c8b3
 network layer decides is best.
a4c8b3
 
1c8eda
@@ -1098,7 +1098,7 @@ If set, iscsid will perform discovery to
1c8eda
 discovery.isns.discoveryd_poll_inval or
1c8eda
 discovery.sendtargets.discoveryd_poll_inval seconds,
1c8eda
 and it will log into any portals found from the discovery source using
1c8eda
-the ifaces in /etc/iscsi/ifaces.
1c8eda
+the ifaces in /var/lib/iscsi/ifaces.
1c8eda
 
1c8eda
 Note that for iSNS the poll_interval does not have to be set. If not set,
1c8eda
 iscsid will only perform rediscovery when it gets a SCN from the server.
1c8eda
Only in open-iscsi-2.0-872-rc3-bnx2i.diff/: README.orig
1c8eda
diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c
1c8eda
--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c	2010-07-11 03:58:50.000000000 -0500
1c8eda
+++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c	2010-07-11 03:59:00.000000000 -0500
1c8eda
@@ -2235,9 +2235,9 @@ free_info:
a4c8b3
 int idbm_init(idbm_get_config_file_fn *fn)
a4c8b3
 {
d3d856
 	/* make sure root db dir is there */
d3d856
-	if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
d3d856
-		if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
d3d856
-			log_error("Could not make %s %d\n", ISCSI_CONFIG_ROOT,
d3d856
+	if (access(ISCSIVAR, F_OK) != 0) {
d3d856
+		if (mkdir(ISCSIVAR, 0660) != 0) {
d3d856
+			log_error("Could not make %s %d\n", ISCSIVAR,
d3d856
 				   errno);
a4c8b3
 			return errno;
mchristi a7062b
 		}
1c8eda
Only in open-iscsi-2.0-872-rc3-bnx2i.diff/usr: idbm.c.orig
1c8eda
diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.h
1c8eda
--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.h	2010-07-11 03:45:50.000000000 -0500
1c8eda
+++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.h	2010-07-11 03:59:00.000000000 -0500
5ebdd5
@@ -27,12 +27,15 @@
d3d856
 #include "initiator.h"
d3d856
 #include "config.h"
mchristi a7062b
 
d3d856
-#define NODE_CONFIG_DIR		ISCSI_CONFIG_ROOT"nodes"
d3d856
-#define SLP_CONFIG_DIR		ISCSI_CONFIG_ROOT"slp"
d3d856
-#define ISNS_CONFIG_DIR		ISCSI_CONFIG_ROOT"isns"
d3d856
-#define STATIC_CONFIG_DIR	ISCSI_CONFIG_ROOT"static"
5ebdd5
-#define FW_CONFIG_DIR		ISCSI_CONFIG_ROOT"fw"
d3d856
-#define ST_CONFIG_DIR		ISCSI_CONFIG_ROOT"send_targets"
d3d856
+#define ISCSIVAR		"/var/lib/iscsi/"
5ebdd5
+
d3d856
+#define NODE_CONFIG_DIR		ISCSIVAR"nodes"
d3d856
+#define SLP_CONFIG_DIR		ISCSIVAR"slp"
d3d856
+#define ISNS_CONFIG_DIR		ISCSIVAR"isns"
d3d856
+#define STATIC_CONFIG_DIR	ISCSIVAR"static"
d3d856
+#define ST_CONFIG_DIR		ISCSIVAR"send_targets"
5ebdd5
+#define FW_CONFIG_DIR		ISCSIVAR"fw"
5ebdd5
+
d3d856
 #define ST_CONFIG_NAME		"st_config"
1c8eda
 #define ISNS_CONFIG_NAME	"isns_config"
mchristi a7062b
 
1c8eda
diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/iface.h open-iscsi-2.0-872-rc3-bnx2i.diff/usr/iface.h
1c8eda
--- open-iscsi-2.0-872-rc3-bnx2i/usr/iface.h	2010-07-11 03:45:50.000000000 -0500
1c8eda
+++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/iface.h	2010-07-11 03:59:00.000000000 -0500
5ebdd5
@@ -20,7 +20,9 @@
a4c8b3
 #ifndef ISCSI_IFACE_H
a4c8b3
 #define ISCSI_IFACE_H
a4c8b3
 
a4c8b3
-#define IFACE_CONFIG_DIR	ISCSI_CONFIG_ROOT"ifaces"
5ebdd5
+#include "idbm.h"
5ebdd5
+
5ebdd5
+#define IFACE_CONFIG_DIR	ISCSIVAR"ifaces"
a4c8b3
 
a4c8b3
 struct iface_rec;
a4c8b3
 struct list_head;