Author: mzugec Date: Fri Feb 20 12:26:35 2009 New Revision: 55636 URL: http://svn.opensuse.org/viewcvs/yast?rev=55636&view=rev Log: fixed configuration of OSA Layer2 during installation (bnc#476253) Modified: trunk/network/VERSION trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=55636&r1=55635&r2=55636&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Feb 20 12:26:35 2009 @@ -1 +1 @@ -2.18.7 +2.18.8 Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=55636&r1=55635&r2=55636&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Fri Feb 20 12:26:35 2009 @@ -96,13 +96,14 @@ ReadInstallInfItem(install_inf, "module", "Alias"); ReadInstallInfItem(install_inf, "proxy", "Proxy"); // ReadInstallInfItem(install_inf, "options", "Options"); + // OSAHwAddr parameter s390 ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); ReadInstallInfItem(install_inf, "ethtool_options", "ethtool"); ReadInstallInfItem(install_inf, "unique", "NetUniqueID"); ReadInstallInfItem(install_inf, "connect_wait", "ConnectWait"); ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); - ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); +// ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); ReadInstallInfItem(install_inf, "WESSID", "WlanESSID"); ReadInstallInfItem(install_inf, "WAuth", "WlanAuth"); @@ -257,8 +258,8 @@ network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); // for queth devices (s390) - if (size(InstallInf["LLADDR"]:"")>0) - network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); + if (size(InstallInf["hwaddr"]:"")>0) + network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["hwaddr"]:""); if (network_disk) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org