Author: mzugec Date: Wed Mar 3 10:46:04 2010 New Revision: 61113 URL: http://svn.opensuse.org/viewcvs/yast?rev=61113&view=rev Log: disable iBFT for non-x86 architecture (bnc#582615) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=61113&r1=61112&r2=61113&view=diff ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Wed Mar 3 10:46:04 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=61113&r1=61112&r2=61113&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Mar 3 10:46:04 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 3 10:45:42 CET 2010 - mzugec@suse.cz + +- disable iBFT for non-x86 architecture (bnc#582615) +- 2.19.1 + +------------------------------------------------------------------- Tue Feb 9 13:19:16 CET 2010 - mzugec@suse.cz - wait when start iscsid (bnc#570678) Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=61113&r1=61112&r2=61113&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Wed Mar 3 10:46:04 2010 @@ -9,6 +9,7 @@ import "ModuleLoading"; import "Mode"; import "String"; +import "Arch"; global list <string> sessions = []; global list <string> discovered = []; @@ -43,6 +44,10 @@ */ global map getiBFT(){ if (ibft==nil){ + if (!Arch::i386() && !Arch::x86_64()){ + y2milestone("Because architecture %1 is is different from x86, not using iBFT", Arch::arch_short()); + return $[]; + } ibft=$[]; y2milestone("check and modprobe iscsi_ibft : %1", SCR::Execute(.target.bash_output, "lsmod |grep -q iscsi_ibft || modprobe iscsi_ibft")); string from_bios = ((map)SCR::Execute(.target.bash_output, "iscsiadm -m fw"))["stdout"]:""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org