OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-iscsi?expand=0&rev=11

open-iscsi-fw-crash-on-ppc

@@ -0,0 +1,26 @@
+commit 8cf4c3b44ca99422b41e2ff0eecd473c1f1cd4e3
+Author: Hannes Reinecke <hare@suse.de>
+Date:   Thu Nov 27 09:34:02 2008 +0100
+
+    iscsiadm -m fw crashed on PowerPC
+    
+    When no OpenFW boot parameters are found we should not try
+    to search iBFT on PowerPC. That doesn't work, of course.
+    
+    References: 449116
+    
+    Signed-off-by: Hannes Reinecke <hare@suse.de>
+
+diff --git a/utils/fwparam_ibft/fw_entry.c b/utils/fwparam_ibft/fw_entry.c
+index fbfa3dd..072c185 100644
+--- a/utils/fwparam_ibft/fw_entry.c
++++ b/utils/fwparam_ibft/fw_entry.c
+@@ -28,7 +28,7 @@ int fw_get_entry(struct boot_context *context, const char *filepath)
+ 	int ret;
+ 
+ 	ret = fwparam_ppc(context, filepath);
+-	if (ret)
++	if (ret < 0)
+ 		ret = fwparam_ibft(context, filepath);
+ 	return ret;
+ }

open-iscsi.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  2 15:47:31 CET 2008 - hare@suse.de
+
+- iscsiadm -m fw crashes on ppc (bnc#449116)
+
 -------------------------------------------------------------------
 Thu Nov 20 15:48:55 CET 2008 - hare@suse.de
 

open-iscsi.spec

@@ -26,7 +26,7 @@ Group:          Productivity/Networking/Other
 PreReq:         %fillup_prereq %insserv_prereq
 AutoReqProv:    on
 Version:        2.0.870
-Release:        20
+Release:        21
 Provides:       linux-iscsi
 Obsoletes:      linux-iscsi
 %define iscsi_release 865
@@ -56,6 +56,7 @@ Patch20:        %{name}-add-mkinitrd-scriptlets
 Patch21:        %{name}-install-mkinitrd-scriptlets
 Patch22:        %{name}-no-pid-file
 Patch23:        %{name}-cxgb3i-support
+Patch24:        %{name}-fw-crash-on-ppc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -108,6 +109,7 @@ Authors:
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -DLOCK_DIR=\\\"/etc/iscsi\\\""
@@ -155,6 +157,8 @@ fi
 %doc %{_mandir}/man8/*
 
 %changelog
+* Tue Dec 02 2008 hare@suse.de
+- iscsiadm -m fw crashes on ppc (bnc#449116)
 * Thu Nov 20 2008 hare@suse.de
 - Add cxgb3i support (bnc#433500, FATE#304154)
 - No pid file from init scripts