Author: kmachalkova
Date: Tue Feb 9 11:37:53 2010
New Revision: 60753
URL: http://svn.opensuse.org/viewcvs/yast?rev=60753&view=rev
Log:
write_hostname - clone me
Modified:
branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes
branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=60753&r1=60752&r2=60753&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Tue Feb 9 11:37:53 2010
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Feb 9 11:35:22 CET 2010 - kmachalkova@suse.cz
+
+- Include in cloned data (bnc#576495)
+
+-------------------------------------------------------------------
Mon Feb 8 16:15:10 CET 2010 - mzugec@suse.cz
- correctly setup iucv devices (bnc#575950)
Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp?rev=60753&r1=60752&r2=60753&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp Tue Feb 9 11:37:53 2010
@@ -318,6 +318,7 @@
dhcp_hostname = settings["dhcp_hostname"]:false;
//if not defined, set to 'auto'
resolv_conf_policy = settings["resolv_conf_policy"]:"auto";
+
// user-defined value has higher priority - FaTE#305281
if ( haskey(settings, "write_hostname") )
write_hostname = settings["write_hostname"]:false;
@@ -340,7 +341,9 @@
nameservers = (list<string>) eval(settings["nameservers"]:[]);
searchlist = (list<string>) eval(settings["searchlist"]:[]);
modified = true;
- initialized = true;
+ // empty settings means that we're probably resetting the config
+ // thus, setup is not initialized anymore
+ initialized = ( settings != $[] );
y2milestone("DNS Import:");
y2milestone("nameservers=%1", nameservers);
@@ -369,6 +372,8 @@
expdns["dhcp_hostname"] = dhcp_hostname;
//TODO: test if it really works with empty string
expdns["resolv_conf_policy"] = resolv_conf_policy;
+ //bnc#576495, FaTE#305281 - clone write_hostname, too
+ expdns["write_hostname"] = write_hostname;
return expdns;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
