Support bind by hw address or netdev (ip address is temp disabled because targets are not handling it well) and use the iface argument instead of the actual values

git-svn-id: svn://svn.berlios.de/open-iscsi@845 d7303112-9cec-0310-bdd2-e83a94d6c2b6

2 files changed, 36 insertions, 28 deletions

diff --git a/etc/iface.example b/etc/iface.example
new file mode 100644
index 0000000..0bc9e22
--- /dev/null
+++ b/etc/iface.example
@@ -0,0 +1,34 @@
+#
+# Example iSCSI interface config
+#
+# There must be a seperate iscsi interface config file for each NIC, network
+# interface or port or iscsi HBA you want to bind sessions to.
+#
+# For hardware/offload iscsi, this is created for you when you run iscsiadm.
+# For software iscsi, you must define these files yourself.
+#
+
+# Set the iscsi transport/driver to use for the iface by setting
+# iface.transport_name
+# example:
+# iface.transport_name = tcp
+
+# This values is required and valid values for iface.transport_name are:
+# - tcp (Software iSCSI over TCP/IP)
+# - iser (Software iSCSI over infinniband
+# - qla4xxx (Qlogic QLA4XXX HBAs)
+
+
+# One of the following values are required for the binding.
+#
+# To bind by network interface name (example: eth0, eth2:2, eth1.3)
+# set iface.net_ifacename
+# example:
+# iface.net_ifacename = eth0
+
+# To bind by hardware address set the NIC's MAC address to iface.hwaddress
+# example:
+# iface.hwaddress = 00:0F:1F:92:6B:BF
+
+# Note you can only bind using one value. If you set multiple values
+# the bahavior is not defined.
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index a2b4ad6..78e6824 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
@@ -17,34 +17,8 @@
 #############################
 # NIC/HBA and driver settings
 #############################
-# open-iscsi can create a session and bind it to a NIC/HBA. It
-# is currently limited to 32 NICs/HBAs, but this can be easily
-# changed so if you need a larger value send a mail.
-#
-# To define the defaults NICs/HBAs you want to create sessions
-# through, set the iface.hwaddress value to the MAC address of the NIC.
-#
-# open-iscsi can create sessions over serveral interconnects like iser
-# and tcp. To specific which interconnect to use you can set the
-# iface's transport_name value to "tcp" or "iser"
-#
-# iface[0].hwaddress = 00:0F:1F:92:6B:BF
-# iface[0].transport_name = tcp
-#
-# iface[1].hwaddress = 00:0F:1F:92:6C:BF
-# iface[1].transport_name = tcp
-#
-# iface[2].hwaddress = 00:0F:1F:92:6C:CC
-# iface[2].transport_name = tcp
-# the largest index that can be used is 31.
-#
-# For iscsi_tcp and ib_iser, The default behavior is create a single
-# session and let the network and infinninband layers decide which
-# NIC/RNIC to route through.
-# iface[0].hwaddress = default
-#
-# The default driver to use is iscsi_tcp
-# iface[0].transport_name = tcp
+# open-iscsi can create a session and bind it to a NIC/HBA.
+# To set this up see the example iface config file.
 
 #*****************
 # Startup settings