Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at Fri Aug 12 10:33:49 CEST 2011.
-------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2011-07-14 12:17:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-iscsi-client/yast2-iscsi-client.changes 2011-08-11 18:46:06.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Aug 5 12:32:45 CEST 2011 - [email protected] + +- fixed .desktop file (bnc #681249) +- 2.21.2 + +------------------------------------------------------------------- +Thu Jul 28 12:17:34 CEST 2011 - [email protected] + +- adapt to work with iscsi_offload script in open-iscsi + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-iscsi-client-2.21.1.tar.bz2 New: ---- yast2-iscsi-client-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.rMvgKZ/_old 2011-08-12 10:33:37.000000000 +0200 +++ /var/tmp/diff_new_pack.rMvgKZ/_new 2011-08-12 10:33:37.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-iscsi-client -Version: 2.21.1 +Version: 2.21.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.21.1.tar.bz2 +Source0: yast2-iscsi-client-2.21.2.tar.bz2 Prefix: /usr @@ -46,7 +46,7 @@ client. %prep -%setup -n yast2-iscsi-client-2.21.1 +%setup -n yast2-iscsi-client-2.21.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-iscsi-client-2.21.1.tar.bz2 -> yast2-iscsi-client-2.21.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.1/VERSION new/yast2-iscsi-client-2.21.2/VERSION --- old/yast2-iscsi-client-2.21.1/VERSION 2011-07-14 11:29:47.000000000 +0200 +++ new/yast2-iscsi-client-2.21.2/VERSION 2011-07-28 12:20:28.000000000 +0200 @@ -1 +1 @@ -2.21.1 +2.21.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.1/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.21.2/src/IscsiClientLib.ycp --- old/yast2-iscsi-client-2.21.1/src/IscsiClientLib.ycp 2011-07-14 11:29:04.000000000 +0200 +++ new/yast2-iscsi-client-2.21.2/src/IscsiClientLib.ycp 2011-07-28 12:20:13.000000000 +0200 @@ -31,6 +31,8 @@ // interface type for hardware offloading string offload_card = "default"; +string offboard_script = "iscsi_offload"; + void CallConfigScript(); global string GetOffloadCard() @@ -696,23 +698,63 @@ ``{ if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) offload_valid[idx] = add( offload_valid[idx]:[], - [ hw["iface"]:"", hw["macaddr"]:""] ); + [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+hw["modules",0]:""] ); }); } idx = idx+1; }); + map<string,map> offload_res = $[]; + string cmd = ""; + foreach( integer i, list eth, offload_valid, + { + offload_valid[i] = filter( list l, (list<list>)eth, + { + cmd = offboard_script + " " + l[0]:""; + y2milestone( "GetOffloadItems cmd:%1", cmd ); + map out = (map) SCR::Execute (.target.bash_output, cmd ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + offload_res[l[0]:""] = $[]; + offload_res[l[0]:"","exit"] = out["exit"]:1; + list<string> sl = []; + if( out["exit"]:1==0 ) + { + sl = splitstring( out["stdout"]:"", " \n" ); + offload_res[l[0]:"","hwaddr"] = sl[0]:""; + offload_res[l[0]:"","ntype"] = sl[1]:""; + } + return out["exit"]:1==0 && size(sl[0]:"")>0; + }); + }); + y2milestone( "GetOffloadItems offload_res:%1", offload_res ); + y2milestone( "GetOffloadItems offload_valid:%1", offload_valid ); + foreach( integer i, list eth, offload_valid, + { + offload_valid[i] = maplist( list l, (list<list>)eth, + { + l[1] = offload_res[l[0]:"","hwaddr"]:""; + return( l ); + }); + }); + y2milestone( "GetOffloadItems offload_valid:%1", offload_valid ); foreach( integer i, list eth, offload_valid, { offload_valid[i] = maplist( list l, (list<list>)eth, { - map out = (map) SCR::Execute (.target.bash_output, "ifconfig " + l[0]:"" ); + cmd = "ifconfig " + l[0]:""; + y2milestone( "GetOffloadItems cmd:%1", cmd ); + map out = (map) SCR::Execute (.target.bash_output, cmd ); y2milestone( "GetOffloadItems out:%1", out ); string line = filter( string ln, splitstring( out["stdout"]:"", "\n" ), ``(search(ln,"inet addr:")!=nil))[0]:""; y2milestone( "GetOffloadItems line:%1", line ); - line = substring( line, search( line, "inet addr:")+10 ); - y2milestone( "GetOffloadItems line:%1", line ); - l = add( l, substring( line, 0, findfirstof( line, " \t" )) ); + string ipaddr = "unknown"; + if( size(line)>0 ) + { + line = substring( line, search( line, "inet addr:")+10 ); + y2milestone( "GetOffloadItems line:%1", line ); + ipaddr = substring( line, 0, findfirstof( line, " \t" ) ); + } + l = add( l, ipaddr ); return( l ); }); }); @@ -729,7 +771,7 @@ if( size(l[1]:"" )>0 ) s = s + " - " + l[1]:""; s = s + " - " + offload[i,1]:""; - entries[l[0]:""] = s; + entries[l[2]:""] = s; } }); }); @@ -772,17 +814,16 @@ y2milestone( "CallConfigScript list:%1", sl ); foreach( string s, sl, { - string cmd = "/sbin/iscsi-offload-config " + " "; list hw = []; hw = maplist( integer i, list e, filter( integer i, list eth, offload_valid, ``(contains(flatten((list<list>)eth),s))), ``(e))[0]:[]; y2milestone( "CallConfigScript hw:%1", hw ); - hw = find( list l, (list<list>)hw, ``(l[0]:""==s)); + hw = find( list l, (list<list>)hw, ``(l[2]:""==s)); y2milestone( "CallConfigScript hw:%1", hw ); if( hw != nil ) { - cmd = cmd + hw[1]:"" + " " + hw[2]:"" + " " + s; + string cmd = offboard_script + " " + hw[0]:""; y2milestone( "CallConfigScript cmd:%1", cmd ); map output = (map)SCR::Execute(.target.bash_output, cmd ); y2milestone( "CallConfigScript %1", output ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.1/src/iscsi-client.desktop new/yast2-iscsi-client-2.21.2/src/iscsi-client.desktop --- old/yast2-iscsi-client-2.21.1/src/iscsi-client.desktop 2011-03-08 17:13:28.000000000 +0100 +++ new/yast2-iscsi-client-2.21.2/src/iscsi-client.desktop 2011-08-11 18:40:28.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 X-SuSE-YaST-Call=iscsi-client ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
