Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2012-02-16 12:29:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old) and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes 2011-11-05 12:18:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes 2012-02-16 12:29:15.000000000 +0100 @@ -1,0 +2,36 @@ +Wed Feb 15 11:36:05 CET 2012 - [email protected] + +- version 2.22.0 + +------------------------------------------------------------------- +Mon Feb 6 14:05:22 CET 2012 - [email protected] + +- change detection of qla iscsi devices (bnc#745201) + +------------------------------------------------------------------- +Thu Feb 2 16:03:22 CET 2012 - [email protected] + +- call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) + +------------------------------------------------------------------- +Wed Feb 1 19:34:51 CET 2012 - [email protected] + +- create /etc/iscsi to prevent crash if nonexistant (bnc#742570) +- prevent calling getiBFT() before open-iscsi install (bnc#725833) + +------------------------------------------------------------------- +Thu Jan 12 11:28:17 CET 2012 - [email protected] + +- remove portal group from target portal (bnc#738037) + +------------------------------------------------------------------- +Tue Dec 6 18:22:15 UTC 2011 - [email protected] + +- fix parsing of iscsiadm output in IscsiClientLib.ycp (bnc#725182) + +------------------------------------------------------------------- +Mon Nov 28 16:35:51 CET 2011 - [email protected] + +- fixed module names + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-2.21.9.tar.bz2 New: ---- yast2-iscsi-client-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.s8Rxvk/_old 2012-02-16 12:29:16.000000000 +0100 +++ /var/tmp/diff_new_pack.s8Rxvk/_new 2012-02-16 12:29:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-iscsi-client # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: yast2-iscsi-client -Version: 2.21.9 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.21.9.tar.bz2 +Source0: yast2-iscsi-client-2.22.0.tar.bz2 Prefix: /usr @@ -47,7 +47,7 @@ client. %prep -%setup -n yast2-iscsi-client-2.21.9 +%setup -n yast2-iscsi-client-2.22.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-iscsi-client-2.21.9.tar.bz2 -> yast2-iscsi-client-2.22.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.9/VERSION new/yast2-iscsi-client-2.22.0/VERSION --- old/yast2-iscsi-client-2.21.9/VERSION 2011-11-03 16:53:57.000000000 +0100 +++ new/yast2-iscsi-client-2.22.0/VERSION 2012-02-15 11:34:51.000000000 +0100 @@ -1 +1 @@ -2.21.9 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.9/src/IscsiClient.ycp new/yast2-iscsi-client-2.22.0/src/IscsiClient.ycp --- old/yast2-iscsi-client-2.21.9/src/IscsiClient.ycp 2011-05-12 14:59:32.000000000 +0200 +++ new/yast2-iscsi-client-2.22.0/src/IscsiClient.ycp 2012-01-30 19:23:01.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: IscsiClient settings, input and output functions * Authors: Michal Zugec <[email protected]> * - * $Id: IscsiClient.ycp 63976 2011-05-12 12:59:32Z fehr $ + * $Id: IscsiClient.ycp 67327 2012-01-30 18:23:00Z fehr $ * * Representation of the configuration of iscsi-client. * Input and output routines. @@ -176,14 +176,14 @@ if(false) return false; sleep(sl); + // check if required package is installed + if(!installed_packages()) return false; if(IscsiClientLib::getiBFT()==nil) return false; /* Progress finished */ Progress::NextStage(); sleep(sl); Progress::NextStage(); - // check if required package is installed - if(!installed_packages()) return false; // check initiatorname - create it if no exists y2milestone("Check initiator name"); if(!IscsiClientLib::checkInitiatorName()) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.9/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.22.0/src/IscsiClientLib.ycp --- old/yast2-iscsi-client-2.21.9/src/IscsiClientLib.ycp 2011-11-03 16:54:24.000000000 +0100 +++ new/yast2-iscsi-client-2.22.0/src/IscsiClientLib.ycp 2012-02-06 14:34:31.000000000 +0100 @@ -255,7 +255,7 @@ string iface = ""; foreach( string row, data, { - row = deletechars(row,"\t"); + row = substring(row,findfirstnotof(row,"\t "),999); if( search(row,"Target:")!=nil ) target = splitstring(row, " ")[1]:""; else if( search(row,"Portal:")!=nil ) @@ -264,6 +264,9 @@ portal = splitstring(row, " ")[2]:""; else if( search(row,"Persistent Portal:")==nil ) portal = splitstring(row, " ")[1]:""; + integer pos = search(portal,","); + if( pos != nil ) + portal = substring( portal, 0, pos ); } else if( search(row,"Iface Name:")!=nil ) { @@ -318,6 +321,12 @@ global boolean writeInitiatorName(string new_value){ boolean ret=true; string file="/etc/iscsi/initiatorname.iscsi"; + string dir="/etc/iscsi"; + if( (map)SCR::Read (.target.stat, dir )==$[] ) + { + SCR::Execute(.target.mkdir, dir ); + y2milestone( "writeInitiatorName dir:%1", SCR::Read(.target.stat, dir )); + } if ( ((map<string, any>)SCR::Read (.target.lstat, file))["size"]:0>0 ) { y2milestone("%1 file exists, create backup", file); @@ -372,7 +381,7 @@ } ret = writeInitiatorName(initiatorname); } else { - y2internal("initiatorname=%1", initiatorname); + y2milestone("checkInitiatorName initiatorname=%1", initiatorname); if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. @@ -641,8 +650,8 @@ [ "all", "all", [], [] ], [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ], [ "bnx2i" ] ], [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ], [ "cxgb3i" ] ], - [ "enic", "enic/cnic/fnic", [ "enic", "cnic", "fnic" ], [] ], - [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ], [] ], + [ "enic", "enic/cnic/fnic", [ "enic", "fnic" ], [ "fnic" ] ], + [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx", "qlcnic" ], [ "qla4xxx" ] ], [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ], [ "be2iscsi"] ] ]; @@ -652,18 +661,26 @@ { iface_file = $[]; list<string> files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); - y2milestone( "files:%1", files ); + y2milestone( "InitIfaceFile files:%1", files ); + if( files==nil || size(files)==0 ) + { + string cmd = GetAdmCmd("-m iface"); + y2milestone( "InitIfaceFile cmd:%1", cmd ); + y2milestone( "InitIfaceFile ret:%1", SCR::Execute(.target.bash_output, cmd)); + files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); + y2milestone( "InitIfaceFile files:%1", files ); + } foreach( string file, files, { list<string> ls = splitstring( (string)SCR::Read(.target.string, "/etc/iscsi/ifaces/"+file), "\n" ); - y2milestone( "file:%1", file ); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile file:%1", file ); + y2milestone( "InitIfaceFile ls:%1", ls ); ls = filter( string l, ls, ``(search(l,"iface.iscsi_ifacename")!=nil)); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile ls:%1", ls ); if( size(ls)>0 ) iface_file[splitstring(deletechars(ls[0]:""," "),"=")[1]:""] = file; }); - y2milestone( "iface_file:%1", iface_file ); + y2milestone( "InitIfaceFile iface_file:%1", iface_file ); } global list<term> GetOffloadItems() @@ -681,11 +698,12 @@ y2milestone( "GetOffloadItems card:%1", c ); list<list> tmp = maplist( map m, c["drivers"]:[], ``(flatten((list<list>)m["modules"]:[]))); - return( $["modules":maplist( list ml, tmp, ``(ml[0]:"")), + map r = $["modules":maplist( list ml, tmp, ``(ml[0]:"")), "iface":c["dev_name"]:"", - "macaddr":c["resource","hwaddr",0,"addr"]:""]); + "macaddr":c["resource","hwaddr",0,"addr"]:""]; + y2milestone( "GetOffloadItems cinf:%1", r ); + return( r ); }); - y2milestone( "GetOffloadItems hw_mods:%1", hw_mods ); integer idx = 0; foreach( list<any> l, offload, ``{ @@ -697,8 +715,12 @@ foreach( map hw, hw_mods, ``{ if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) + { + y2milestone( "GetOffloadItems l:%1", l ); + y2milestone( "GetOffloadItems valid:%1", hw ); offload_valid[idx] = add( offload_valid[idx]:[], - [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+hw["modules",0]:""] ); + [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+l[3,0]:""] ); + } }); } idx = idx+1; @@ -712,7 +734,8 @@ cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:.."; y2milestone( "GetOffloadItems cmd:%1", cmd ); map out = (map) SCR::Execute (.target.bash_output, cmd ); - y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", + SCR::Execute (.target.bash_output, offboard_script + " " + l[0]:"" )); offload_res[l[0]:""] = $[]; offload_res[l[0]:"","exit"] = out["exit"]:1; list<string> sl = []; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
