Author: jsrain Date: Thu Feb 26 12:12:35 2009 New Revision: 55784 URL: http://svn.opensuse.org/viewcvs/yast?rev=55784&view=rev Log: store HW address only for L2 qeth devices (bnc #479481) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/VERSION?rev=55784&r1=55783&r2=55784&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Thu Feb 26 12:12:35 2009 @@ -1 +1 @@ -2.17.73 +2.17.74 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/package/yast2-network.changes?rev=55784&r1=55783&r2=55784&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Thu Feb 26 12:12:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 26 12:07:25 CET 2009 - jsrain@suse.cz + +- store HW address only for L2 qeth devices (bnc #479481) +- 2.17.74 + +------------------------------------------------------------------- Wed Feb 25 14:47:29 CET 2009 - jsrain@suse.cz - do not store HW address into sysconfig on hsi and some qeth Modified: branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp?rev=55784&r1=55783&r2=55784&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Thu Feb 26 12:12:35 2009 @@ -125,13 +125,8 @@ // hsi devices do not support setting hwaddr (bnc #479481) if (InstallInf["type"]:"" == "hsi" && haskey (InstallInf, "hwaddr")) InstallInf = remove (InstallInf, "hwaddr"); - // do not set MAC address of device if it is the same as of an existing device (bnc #479481) - list<string> known_hwaddr = []; - foreach (map c, (list<map>)SCR::Read (.probe.netcard), { - list hwaddr = maplist (map m, c["resource", "hwaddr"]:[], { return m["addr"]:""; }); - known_hwaddr = (list<string>)merge (known_hwaddr, hwaddr); - }); - if (InstallInf["type"]:"" == "qeth" && haskey (InstallInf, "hwaddr") && contains (known_hwaddr, InstallInf["hwaddr"]:"")) + // set HW address only for qeth set to Layer 2 (bnc #479481) + if (InstallInf["type"]:"" == "qeth" && InstallInf["QETH_LAYER2_SUPPORT"]:"0" != "1") InstallInf = remove (InstallInf, "hwaddr"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org