Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at Fri Jul 15 08:34:40 CEST 2011.
-------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2011-05-12 15:00:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-iscsi-client/yast2-iscsi-client.changes 2011-07-14 12:17:50.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 12 18:13:53 CEST 2011 - [email protected] + +- delay offload initialisation into init function +- fix offload init from old autoyast xml files (bnc#703485) +- 2.21.1 + +------------------------------------------------------------------- @@ -33 +40 @@ -- delete discovered targets (bnc#602108) +- delete discovered targets (bnc#667375) calling whatdependson for head-i586 Old: ---- yast2-iscsi-client-2.21.0.tar.bz2 New: ---- yast2-iscsi-client-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.FsbMjR/_old 2011-07-15 08:34:22.000000000 +0200 +++ /var/tmp/diff_new_pack.FsbMjR/_new 2011-07-15 08:34:22.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-iscsi-client -Version: 2.21.0 +Version: 2.21.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.21.0.tar.bz2 +Source0: yast2-iscsi-client-2.21.1.tar.bz2 Prefix: /usr @@ -46,7 +46,7 @@ client. %prep -%setup -n yast2-iscsi-client-2.21.0 +%setup -n yast2-iscsi-client-2.21.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-iscsi-client-2.21.0.tar.bz2 -> yast2-iscsi-client-2.21.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.0/VERSION new/yast2-iscsi-client-2.21.1/VERSION --- old/yast2-iscsi-client-2.21.0/VERSION 2011-05-12 14:23:08.000000000 +0200 +++ new/yast2-iscsi-client-2.21.1/VERSION 2011-07-14 11:29:47.000000000 +0200 @@ -1 +1 @@ -2.21.0 +2.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.0/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.21.1/src/IscsiClientLib.ycp --- old/yast2-iscsi-client-2.21.0/src/IscsiClientLib.ycp 2011-05-12 14:32:40.000000000 +0200 +++ new/yast2-iscsi-client-2.21.1/src/IscsiClientLib.ycp 2011-07-14 11:29:04.000000000 +0200 @@ -562,30 +562,38 @@ } global boolean autoyastWrite(){ -// do discovery first -list<string> portals = []; -list<string> ifaces = []; -string ifacepar = ""; -foreach(map target, ay_settings["targets"]:[], { - if (!contains(ifaces, target["iface"]:"")){ - ifacepar = ifacepar + "-I " + target["iface"]:""; - ifaces = add(ifaces, target["iface"]:""); - } -}); -foreach(map target, ay_settings["targets"]:[], { - if (!contains(portals, target["portal"]:"")){ - SCR::Execute(.target.bash, GetAdmCmd(sformat("-m discovery %1 -t st -p %2", ifacepar, target["portal"]:""))); - portals = add(portals, target["portal"]:""); - } -}); - foreach(map target, ay_settings["targets"]:[], { -y2internal("login into target %1", target); - loginIntoTarget(target); - currentRecord = [target["portal"]:"", target["target"]:"", target["iface"]:""]; - setStartupStatus(target["startup"]:"manual"); - }); - return true; -} + // do discovery first + list<string> portals = []; + list<string> ifaces = []; + string ifacepar = ""; + foreach(map target, ay_settings["targets"]:[], { + string iface = target["iface"]:"default"; + if (!contains(ifaces, iface)){ + if( size(ifacepar)>0 ) + ifacepar = ifacepar + " "; + ifacepar = ifacepar + "-I " + iface; + ifaces = add(ifaces, iface); + } + }); + if( size( filter( string s, ifaces, ``(s!="default")))>0 ) + { + CallConfigScript(); + } + foreach(map target, ay_settings["targets"]:[], { + if (!contains(portals, target["portal"]:"")){ + SCR::Execute(.target.bash, + GetAdmCmd(sformat("-m discovery %1 -t st -p %2", ifacepar, target["portal"]:""))); + portals = add(portals, target["portal"]:""); + } + }); + foreach(map target, ay_settings["targets"]:[], { + y2internal("login into target %1", target); + loginIntoTarget(target); + currentRecord = [target["portal"]:"", target["target"]:"", target["iface"]:""]; + setStartupStatus(target["startup"]:"manual"); + }); + return true; + } global string Overview(){ string overview = _("Configuration summary..."); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.0/src/dialogs.ycp new/yast2-iscsi-client-2.21.1/src/dialogs.ycp --- old/yast2-iscsi-client-2.21.0/src/dialogs.ycp 2011-05-12 14:59:32.000000000 +0200 +++ new/yast2-iscsi-client-2.21.1/src/dialogs.ycp 2011-07-14 12:11:28.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Michal Zugec <[email protected]> * - * $Id: dialogs.ycp 63976 2011-05-12 12:59:32Z fehr $ + * $Id: dialogs.ycp 64799 2011-07-14 10:11:26Z fehr $ */ { @@ -66,8 +66,7 @@ `TextEntry(`id(`initiator_name), _("Initiator Name")), `MinWidth( 8, `ComboBox(`id(`offload_card), `opt(`notify), - _("Offloa&d Card"), - IscsiClientLib::GetOffloadItems() )))) + _("Offloa&d Card"), [] )))) ), "init" : initInitName, "validate_type" : `function, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.0/src/widgets.ycp new/yast2-iscsi-client-2.21.1/src/widgets.ycp --- old/yast2-iscsi-client-2.21.0/src/widgets.ycp 2011-05-12 14:37:31.000000000 +0200 +++ new/yast2-iscsi-client-2.21.1/src/widgets.ycp 2011-07-12 17:47:44.000000000 +0200 @@ -245,6 +245,7 @@ void initInitName(string key){ y2milestone("initiatorname %1", IscsiClientLib::initiatorname); UI::ChangeWidget(`initiator_name, `Value, IscsiClientLib::initiatorname); + UI::ChangeWidget(`offload_card, `Items, IscsiClientLib::GetOffloadItems()); UI::ChangeWidget(`offload_card, `Value, IscsiClientLib::GetOffloadCard()); y2milestone("OffloadCard %1", IscsiClientLib::GetOffloadCard()); if (size(IscsiClientLib::getiBFT()["iSCSI_INITIATOR_NAME"]:"")>0){ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
