summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/initd/initd.debian2
-rw-r--r--etc/initd/initd.redhat2
-rw-r--r--etc/initd/initd.suse2
-rw-r--r--kernel/scsi_transport_iscsi.c2
-rw-r--r--usr/version.h2
5 files changed, 2 insertions, 8 deletions
diff --git a/etc/initd/initd.debian b/etc/initd/initd.debian
index 957dba5..9e9f134 100644
--- a/etc/initd/initd.debian
+++ b/etc/initd/initd.debian
@@ -30,7 +30,6 @@ 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
@@ -55,7 +54,6 @@ 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 771c34e..c591534 100644
--- a/etc/initd/initd.redhat
+++ b/etc/initd/initd.redhat
@@ -19,7 +19,6 @@ start()
echo -n $"Starting iSCSI initiator service: "
modprobe -q iscsi_tcp
modprobe -q ib_iser
- modprobe -q qla4xxx
daemon iscsid
RETVAL=$?
success
@@ -46,7 +45,6 @@ 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 712e4a1..163479e 100644
--- a/etc/initd/initd.suse
+++ b/etc/initd/initd.suse
@@ -70,7 +70,6 @@ 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
@@ -91,7 +90,6 @@ 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/kernel/scsi_transport_iscsi.c b/kernel/scsi_transport_iscsi.c
index d28fbbc..29730a1 100644
--- a/kernel/scsi_transport_iscsi.c
+++ b/kernel/scsi_transport_iscsi.c
@@ -33,7 +33,7 @@
#define ISCSI_SESSION_ATTRS 15
#define ISCSI_CONN_ATTRS 11
#define ISCSI_HOST_ATTRS 4
-#define ISCSI_TRANSPORT_VERSION "2.0-864"
+#define ISCSI_TRANSPORT_VERSION "2.0-865"
struct iscsi_internal {
int daemon_pid;
diff --git a/usr/version.h b/usr/version.h
index 25cc341..3c540d0 100644
--- a/usr/version.h
+++ b/usr/version.h
@@ -6,7 +6,7 @@
* This may not be the same value as the kernel versions because
* some other maintainer could merge a patch without going through us
*/
-#define ISCSI_VERSION_STR "2.0-864"
+#define ISCSI_VERSION_STR "2.0-865"
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
#endif