Author: fehr Date: Mon Feb 6 14:07:11 2012 New Revision: 67369 URL: http://svn.opensuse.org/viewcvs/yast?rev=67369&view=rev Log: - 2.17.34 - change detection of qla iscsi devices (bnc#745201) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION?rev=67369&r1=67368&r2=67369&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION Mon Feb 6 14:07:11 2012 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes?rev=67369&r1=67368&r2=67369&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Mon Feb 6 14:07:11 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 6 14:05:22 CET 2012 - fehr@suse.de + +- 2.17.34 +- change detection of qla iscsi devices (bnc#745201) + +------------------------------------------------------------------- Thu Feb 2 16:03:22 CET 2012 - fehr@suse.de - 2.17.33 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp?rev=67369&r1=67368&r2=67369&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Mon Feb 6 14:07:11 2012 @@ -651,7 +651,7 @@ [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ], [ "bnx2i" ] ], [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ], [ "cxgb3i" ] ], [ "enic", "enic/cnic/fnic", [ "enic", "fnic" ], [ "fnic" ] ], - [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ], [ "qla4xxx" ] ], + [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx", "qlcnic" ], [ "qla4xxx" ] ], [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ], [ "be2iscsi"] ] ]; @@ -698,11 +698,12 @@ y2milestone( "GetOffloadItems card:%1", c ); list<list> tmp = maplist( map m, c["drivers"]:[], ``(flatten((list<list>)m["modules"]:[]))); - return( $["modules": [ c["driver_module"]:"" ], + map r = $["modules": [ c["driver_module"]:"" ], "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, ``{ @@ -715,8 +716,12 @@ ``{ //if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) if( size(mod)+size(hw["modules"]:[])>size(union(mod,hw["modules"]:[]))) + { + y2milestone( "GetOffloadItems l:%1", l ); + y2milestone( "GetOffloadItems valid:%1", hw ); offload_valid[idx] = add( offload_valid[idx]:[], [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+l[3,0]:""] ); + } }); } idx = idx+1; @@ -730,7 +735,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: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org