Author: jsrain Date: Wed Feb 25 14:55:46 2009 New Revision: 55745 URL: http://svn.opensuse.org/viewcvs/yast?rev=55745&view=rev Log: do not store HW address into sysconfig on hsi and some qeth interfaces (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=55745&r1=55744&r2=55745&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Wed Feb 25 14:55:46 2009 @@ -1 +1 @@ -2.17.72 +2.17.73 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=55745&r1=55744&r2=55745&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Wed Feb 25 14:55:46 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 25 14:47:29 CET 2009 - jsrain@suse.cz + +- do not store HW address into sysconfig on hsi and some qeth + interfaces (bnc #479481) +- 2.17.73 + +------------------------------------------------------------------- Mon Feb 23 11:51:27 CET 2009 - mzugec@suse.cz - restart network when NetworkManager selected (bnc#467939) 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=55745&r1=55744&r2=55745&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 Wed Feb 25 14:55:46 2009 @@ -120,6 +120,21 @@ // InstallInf = remove(InstallInf, "netdevice"); } + if (Arch::s390()) { + y2milestone ("Interface type: %1", InstallInf["type"]:""); + // 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"]:"")) + InstallInf = remove (InstallInf, "hwaddr"); + } + /* Split FQ hostname */ string hostname = InstallInf["hostname"]:""; if(hostname != "" && !IP::Check (hostname)) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org