Rename iface.name to iface.hwaddress and make transport name part of the iface (driver and hardware are bound). Also merge the -D and -I arguments so they are now -I driver,hwaddress. Also add some basic qla4xxx support. We can rescan/scan it and perform sendtargets through it but it stores the targets it finds in Flash and then logs into all of them autmatically (when we do discovery and later when reload the driver). So qla4xxx support is mostly to make sure we have the --interfae argument right. We will have to decide how to set other params, manage nodes, and if we should move scanning to the kernel and then also move some error recovery code to the kernel (today qla4xxx is calling block directly and is not able to export it iscsi state yet (the beginnings to fix that is in the git tree but we still need to reduce some code duplcation)). qla4xxx behavior and functionality is going to change as we learn more about the hw (what format the flash data is supposed to be in for example).

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

4 files changed, 11 insertions, 5 deletions

diff --git a/etc/initd/initd.debian b/etc/initd/initd.debian
index 9e9f134..957dba5 100644
--- a/etc/initd/initd.debian
+++ b/etc/initd/initd.debian
@@ -30,6 +30,7 @@ start() {
 	log_daemon_msg "Starting iSCSI initiator service" "iscsid"
 	modprobe -q iscsi_tcp 2>/dev/null || :
 	modprobe -q ib_iser 2>/dev/null || :
+	modprobe -q qla4xxx 2>/dev/null || :
 	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON
 	RETVAL=$?
 	log_end_msg $RETVAL
@@ -54,6 +55,7 @@ stop() {
 	log_daemon_msg "Stopping iSCSI initiator service"
 	start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
 	rm -f $PIDFILE
+	modprobe -r qla4xxx 2>/dev/null
 	modprobe -r ib_iser 2>/dev/null
 	modprobe -r iscsi_tcp 2>/dev/null
 	log_end_msg 0
diff --git a/etc/initd/initd.redhat b/etc/initd/initd.redhat
index c591534..771c34e 100644
--- a/etc/initd/initd.redhat
+++ b/etc/initd/initd.redhat
@@ -19,6 +19,7 @@ start()
 	echo -n $"Starting iSCSI initiator service: "
 	modprobe -q iscsi_tcp
 	modprobe -q ib_iser
+	modprobe -q qla4xxx
 	daemon iscsid
 	RETVAL=$?
 	success
@@ -45,6 +46,7 @@ stop()
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/open-iscsi
 	modprobe -r iscsi_tcp 2>/dev/null
 	modprobe -r ib_iser 2>/dev/null
+	modprobe -r qla4xxx 2>/dev/null
 	success
 	echo
 
diff --git a/etc/initd/initd.suse b/etc/initd/initd.suse
index 163479e..712e4a1 100644
--- a/etc/initd/initd.suse
+++ b/etc/initd/initd.suse
@@ -70,6 +70,7 @@ case "$1" in
 	    echo -n "Starting iSCSI initiator service: "
 	    modprobe iscsi_tcp
 	    modprobe -q ib_iser
+	    modprobe -q qla4xxx 
 	    startproc $DAEMON $ARGS
 	    RETVAL=$?
 	    rc_status -v
@@ -90,6 +91,7 @@ case "$1" in
 	    rm -f $PID_FILE
 	    modprobe -r iscsi_tcp
 	    modprobe -q -r ib_iser
+	    modprobe -q -r qla4xxx
 	    rc_failed 0
 	else
 	    rc_failed 1
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index bd4f637..4899ced 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
@@ -22,26 +22,26 @@
 # 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.name value to the MAC address of the NIC.
+# 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].name = 00:0F:1F:92:6B:BF
+# iface[0].hwaddress = 00:0F:1F:92:6B:BF
 # iface[0].transport_name = tcp
 #
-# iface[1].name = 00:0F:1F:92:6C:BF
+# iface[1].hwaddress = 00:0F:1F:92:6C:BF
 # iface[1].transport_name = tcp
 #
-# iface[2].name = 00:0F:1F:92:6C:CC
+# 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].name = default
+# iface[0].hwaddress = default
 #
 # The default driver to use is iscsi_tcp
 # iface[0].transport_name = tcp