Author: kmachalkova Date: Mon Sep 1 18:46:13 2008 New Revision: 50536 URL: http://svn.opensuse.org/viewcvs/yast?rev=50536&view=rev Log: Make NETCONFIG_DNS_POLICY clonable Modified: trunk/network/src/config/networking.rnc trunk/network/src/modules/DNS.ycp Modified: trunk/network/src/config/networking.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/networking.rnc?rev=50536&r1=50535&r2=50536&view=diff ============================================================================== --- trunk/network/src/config/networking.rnc (original) +++ trunk/network/src/config/networking.rnc Mon Sep 1 18:46:13 2008 @@ -210,14 +210,14 @@ dns = element dns { dhcp_hostname ? & - dhcp_resolv ? & + resolv_conf_policy ? & hostname ? & domain ? & nameservers ? & searchlist ? } dhcp_hostname = element dhcp_hostname { BOOLEAN } -dhcp_resolv = element dhcp_resolv { BOOLEAN } +resolv_conf_policy = element resolv_conf_policy { text } hostname = element hostname { text } domain = element domain { text } nameservers = Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=50536&r1=50535&r2=50536&view=diff ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Mon Sep 1 18:46:13 2008 @@ -320,7 +320,9 @@ domain = settings["domain"]:""; nameservers = (list<string>) eval(settings["nameservers"]:[]); searchlist = (list<string>) eval(settings["searchlist"]:[]); - modified = true; + //if not defined, set to 'auto' + resolv_conf_policy = settings["resolv_conf_policy"]:"auto"; + modified = true initialized = true; return true; } @@ -339,6 +341,8 @@ expdns["nameservers"] = eval(nameservers); if (size(searchlist) >0) expdns["searchlist"] = eval(searchlist); + //TODO: test if it really works with empty string + expdns["resolv_conf_policy"] = resolv_conf_policy; return expdns; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org