[iscsi-initiator-utils: 39/109] Resolves: #556985

[Chris Leech]

commit 4bd6b84ddb0ff182e426c57584be51a5ba64c9d9
Author: mchristi <mchristi at redhat.com>
Date:   Mon Jan 25 19:17:05 2010 +0000

    Resolves: #556985

 iscsi-initiator-utils-fix-s390-compile.patch |   10 ++++++++++
 iscsi-initiator-utils.spec                   |   12 +++++++++---
 iscsid.init                                  |   16 ++++++++++++++--
 3 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/iscsi-initiator-utils-fix-s390-compile.patch b/iscsi-initiator-utils-fix-s390-compile.patch
new file mode 100644
index 0000000..3d26ab1
--- /dev/null
+++ b/iscsi-initiator-utils-fix-s390-compile.patch
@@ -0,0 +1,10 @@
+--- open-iscsi-2.0-871.1.1-bnx2i/usr/log.h	2010-01-21 16:12:53.535261347 -0500
++++ open-iscsi-2.0-871.1.1-bnx2i.work/usr/log.h	2010-01-21 15:54:08.475338365 -0500
+@@ -27,6 +27,7 @@
+ #define LOG_H
+ 
+ #include <stdarg.h>
++#include <sys/types.h>
+ #include "iscsid.h"
+ 
+ union semun {
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 12b34c1..b12b724 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.871.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-871.1.1-bnx2i.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -14,6 +14,7 @@ Patch2: iscsi-initiator-utils-use-red-hat-for-name.patch
 Patch3: iscsi-initiator-utils-add-libiscsi.patch
 Patch4: iscsi-initiator-utils-uip-mgmt.patch
 Patch5: iscsi-initiator-utils-fix-missing-includes.patch
+Patch6: iscsi-initiator-utils-fix-s390-compile.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -22,7 +23,6 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel flex bison python-devel doxygen glibc-static
 Requires(post): chkconfig
 Requires(preun): chkconfig /sbin/service
-ExcludeArch: s390 s390x
 
 %description
 The iscsi package provides the server daemon for the iSCSI protocol,
@@ -47,6 +47,7 @@ developing applications that use %{name}.
 %patch3 -p1 -b .add-libiscsi
 %patch4 -p1 -b .uip-mgmt
 %patch5 -p1 -b .fix-missing-includes
+%patch6 -p1 -b .fix-s390-compile
 
 %build
 make OPTFLAGS="%{optflags}" -C utils/sysdeps
@@ -161,7 +162,12 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
-* Fri Jan 25 2010 Mike Christie <mchristi at redhat.com> 6.2.0.871.1.1-1
+* Thu Jan 21 2010 Mike Christie <mchristi at redhat.com> 6.2.0.871.1.1-2
+- 556985 Fix up init.d iscsid script to remove offload modules and
+  load be2iscsi.
+- Enable s390/s390x
+
+* Fri Jan 15 2010 Mike Christie <mchristi at redhat.com> 6.2.0.871.1.1-1
 - Sync to upstream
 - 529324 Add iscsi-iname and iscsistart man page
 - 463582 OF/iBFT support
diff --git a/iscsid.init b/iscsid.init
index 5de8ea4..5b7e709 100755
--- a/iscsid.init
+++ b/iscsid.init
@@ -39,6 +39,7 @@ force_start() {
     modprobe -q ib_iser
     modprobe -q cxgb3i
     modprobe -q bnx2i
+    modprobe -q be2iscsi
     daemon brcm_iscsiuio
     daemon $prog
     retval=$?
@@ -72,10 +73,21 @@ stop() {
     fi
 
     echo -n $"Stopping $prog: "
-    killproc $prog
-    retval=$?
+ 
+    iscsiadm -k 0
     echo
 
+    killproc brcm_iscsiuio
+    rm -f /var/run/brcm_iscsiuio.pid
+
+    # only remove the iscsi drivers when offload is used
+    rmmod bnx2i 2>/dev/null
+    rmmod cnic 2>/dev/null
+
+    rmmod cxgb3i 2>/dev/null
+
+    modprobe -r be2iscsi 2>/dev/null
+
     modprobe -r ib_iser 2>/dev/null
     modprobe -r iscsi_tcp 2>/dev/null