Author: mzugec Date: Mon Aug 27 11:18:27 2007 New Revision: 40491 URL: http://svn.opensuse.org/viewcvs/yast?rev=40491&view=rev Log: correctly handle NisDomain option from install.inf (#303844) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40491&r1=40490&r2=40491&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Aug 27 11:18:27 2007 @@ -1 +1 @@ -2.15.67 +2.15.68 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=40491&r1=40490&r2=40491&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Aug 27 11:18:27 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 27 11:18:11 CEST 2007 - mzugec@suse.cz + +- correctly handle NisDomain option from install.inf (#303844) +- 2.15.68 + +------------------------------------------------------------------- Fri Aug 24 16:55:51 CEST 2007 - mzugec@suse.cz - use "netcard" macro from NetworkDevices (#303847) Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=40491&r1=40490&r2=40491&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Mon Aug 27 11:18:27 2007 @@ -78,6 +78,7 @@ ReadInstallInfItem(install_inf, "gateway", "Gateway"); ReadInstallInfItem(install_inf, "nameserver", "Nameserver"); ReadInstallInfItem(install_inf, "domain", "Domain"); + ReadInstallInfItem(install_inf, "nisdomain", "NisDomain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); // ReadInstallInfItem(install_inf, "options", "Options"); @@ -249,9 +250,9 @@ } } // create defaultdomain - if (size(InstallInf["domain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ - y2milestone("Write defaultdomain: %1", InstallInf["domain"]:""); - SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["domain"]:""); + if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ + y2milestone("Write defaultdomain: %1", InstallInf["nisdomain"]:""); + SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["nisdomain"]:""); } // write wait_for_interfaces if needed @@ -291,7 +292,7 @@ WFM::Execute(.local.bash, "udevtrigger --subsystem-match=net"); WFM::Execute (.local.bash, sformat ( - "mkdir -p '%2%1'; /bin/cp -p %1/70-net_persistent_names.rules '%2%1'", + "mkdir -p '%2%1'; /bin/cp -p %1/70-persistent-net.rules'%2%1'", "/etc/udev/rules.d", String::Quote (Installation::destdir))); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org