[yast-commit] r49930 - in /trunk/dns-server: package/ src/ testsuite/tests/ - YaST Commits

11 Aug 2008

Author: locilka
Date: Mon Aug 11 13:17:52 2008
New Revision: 49930

URL: http://svn.opensuse.org/viewcvs/yast?rev=49930&view=rev
Log:
Adjusted testsuites


Modified:
    trunk/dns-server/package/yast2-dns-server.changes
    trunk/dns-server/src/DnsServer.pm
    trunk/dns-server/testsuite/tests/DnsServerAPI.out
    trunk/dns-server/testsuite/tests/DnsServerAPI.ycp
    trunk/dns-server/testsuite/tests/Read.out
    trunk/dns-server/testsuite/tests/Read.ycp
    trunk/dns-server/testsuite/tests/Write.out
    trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.out
    trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.ycp
    trunk/dns-server/testsuite/tests/YaPIReadZones.out
    trunk/dns-server/testsuite/tests/YaPIReadZones.ycp
    trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.out
    trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.ycp
    trunk/dns-server/testsuite/tests/YaPIWriteZones.out
    trunk/dns-server/testsuite/tests/YaPIWriteZones.ycp

Modified: trunk/dns-server/package/yast2-dns-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-server.changes?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================

--- trunk/dns-server/package/yast2-dns-server.changes (original)
+++ trunk/dns-server/package/yast2-dns-server.changes Mon Aug 11 13:17:52 2008
@@ -4,6 +4,7 @@
 - Using netconfig to configure DNS forwarders (patch created by
   sschober@suse.de) (FATE #303386).
 - Package sysconfig is newly required (because of /sbin/netconfig).
+- Adjusted testsuites.
 - 2.17.6
 
 -------------------------------------------------------------------

Modified: trunk/dns-server/src/DnsServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/src/DnsServer.pm (original)
+++ trunk/dns-server/src/DnsServer.pm Mon Aug 11 13:17:52 2008
@@ -1036,7 +1036,7 @@
 	}
     }
     $forwarders_value = SCR->Read(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS") || "";
-    $forwarders_value = "{ ".join("; ", split( " ", $forwarders_value))." };";
+    $forwarders_value = join("; ", split( " ", $forwarders_value));
     y2milestone ("NETCONFIG_DNS_STATIC_SERVERS: $forwarders_value");
     # no forwarders are defined in single file or file doesn't exist
     # but forwarders are defined right in options

Modified: trunk/dns-server/testsuite/tests/DnsServerAPI.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsServerAPI.out?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/DnsServerAPI.out (original)
+++ trunk/dns-server/testsuite/tests/DnsServerAPI.out Mon Aug 11 13:17:52 2008
@@ -13,12 +13,12 @@
 Execute	.dns.named_conf_convert "/etc/named.conf" 0
 Execute	.target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""]
 Read	.sysconfig.named.NAMED_RUN_CHROOTED nil
-Read	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes"
-Read	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes"
+Read	.sysconfig.network.config.NETCONFIG_DNS_POLICY "auto"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Dir	.dns.named.value.options: ["directory", "notify"]
 Read	.dns.named.value.options.directory ["\"/var/lib/named\""]
 Read	.dns.named.value.options.notify ["no"]
+Read	.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "1.2.3.4"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Read	.dns.named.value.acl []
 Read	.sysconfig.named.NAMED_CONF_INCLUDE_FILES nil

Modified: trunk/dns-server/testsuite/tests/DnsServerAPI.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsServerAPI.ycp?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/DnsServerAPI.ycp (original)
+++ trunk/dns-server/testsuite/tests/DnsServerAPI.ycp Mon Aug 11 13:17:52 2008
@@ -110,6 +110,8 @@
 		"config" : $[
 		    "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes",
 		    "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes",
+		    "NETCONFIG_DNS_POLICY" : "auto",
+		    "NETCONFIG_DNS_STATIC_SERVERS" : "1.2.3.4",
 		],
 	    ],
 	],

Modified: trunk/dns-server/testsuite/tests/Read.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/Read.out?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/Read.out (original)
+++ trunk/dns-server/testsuite/tests/Read.out Mon Aug 11 13:17:52 2008
@@ -5,12 +5,12 @@
 Execute	.dns.named_conf_convert "/etc/named.conf" 0
 Execute	.target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""]
 Read	.sysconfig.named.NAMED_RUN_CHROOTED 0
-Read	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes"
-Read	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes"
+Read	.sysconfig.network.config.NETCONFIG_DNS_POLICY "STATIC"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Dir	.dns.named.value.options: ["directory", "notify"]
 Read	.dns.named.value.options.directory ["\"/var/lib/named\""]
 Read	.dns.named.value.options.notify ["no"]
+Read	.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS ""
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Read	.dns.named.value.acl []
 Read	.sysconfig.named.NAMED_CONF_INCLUDE_FILES 0

Modified: trunk/dns-server/testsuite/tests/Read.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/Read.ycp?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/Read.ycp (original)
+++ trunk/dns-server/testsuite/tests/Read.ycp Mon Aug 11 13:17:52 2008
@@ -189,6 +189,8 @@
 		"config" : $[
 		    "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes",
 		    "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes",
+		    "NETCONFIG_DNS_POLICY" : "STATIC",
+		    "NETCONFIG_DNS_STATIC_SERVERS" : "",
 		],
 	    ],
 	    "console" : $[ "CONSOLE_ENCODING" : "utf8" ],

Modified: trunk/dns-server/testsuite/tests/Write.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/Write.out?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/Write.out (original)
+++ trunk/dns-server/testsuite/tests/Write.out Mon Aug 11 13:17:52 2008
@@ -11,9 +11,7 @@
 Write	.dns.named.value.options."xxx" nil true
 Write	.dns.named.value.options."forwarders" nil true
 Write	.dns.named.value.options."directory" ["\"/var/lib/named\""] true
-Write	.dns.named.value.options."include" ["\"/etc/named.d/forwarders.conf\""] true
 Write	.dns.named.value.options."notify" ["no"] true
-Write	.dns.named-forwarders ["/etc/named.d/forwarders.conf", "{}"] true
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Write	.dns.named nil true
 Dir	.dns.named.value: ["options", "zone \"localhost\" in"]
@@ -25,9 +23,7 @@
 Write	.dns.named nil true
 Write	.sysconfig.named.NAMED_RUN_CHROOTED "yes" true
 Write	.sysconfig.named nil true
-Write	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "no" true
-Write	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "no" true
-Write	.sysconfig.network.config nil true
+Write	.sysconfig.network.config.NETCONFIG_DNS_POLICY "0" true
 Read	.sysconfig.named.NAMED_INITIALIZE_SCRIPTS 0
 Write	.sysconfig.named.NAMED_INITIALIZE_SCRIPTS "" true
 Write	.sysconfig.named nil true
@@ -39,4 +35,7 @@
 Write	.dns.named.value."zone \"example.com\" in".type ["master"] true
 Execute	.target.bash "/etc/init.d/named stop" 0
 Write	.target.ycp "/var/lib/YaST2/dns_server" $[] true
+Write	.sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true
+Write	.sysconfig.network.config nil true
+Execute	.target.bash_output "/sbin/netconfig update" $["exit":0, "stdout":"20030806"]
 Return	true

Modified: trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.out?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.out (original)
+++ trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.out Mon Aug 11 13:17:52 2008
@@ -5,12 +5,12 @@
 Execute	.dns.named_conf_convert "/etc/named.conf" 0
 Execute	.target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""]
 Read	.sysconfig.named.NAMED_RUN_CHROOTED nil
-Read	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes"
-Read	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes"
+Read	.sysconfig.network.config.NETCONFIG_DNS_POLICY "STATIC"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Dir	.dns.named.value.options: ["directory", "notify"]
 Read	.dns.named.value.options.directory ["\"/var/lib/named\""]
 Read	.dns.named.value.options.notify ["no"]
+Read	.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "1.2.3.4 5.6.7.8 9.10.11.12"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Read	.dns.named.value.acl []
 Read	.sysconfig.named.NAMED_CONF_INCLUDE_FILES nil
@@ -20,5 +20,5 @@
 Dir	.dns.named.value."zone \"localhost\" in": ["file", "type"]
 Read	.dns.named.value."zone \"localhost\" in"."file" ["\"localhost.zone\""]
 Read	.dns.named.value."zone \"localhost\" in"."type" ["master"]
-Return	[$["key":"directory", "value":"\"/var/lib/named\""], $["key":"notify", "value":"no"], $["key":"forwarders", "value":""]]
+Return	[$["key":"directory", "value":"\"/var/lib/named\""], $["key":"notify", "value":"no"], $["key":"forwarders", "value":"1.2.3.4; 5.6.7.8; 9.10.11.12"]]
 Dump	==========================================================

Modified: trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.ycp?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.ycp (original)
+++ trunk/dns-server/testsuite/tests/YaPIReadGlobalOptions.ycp Mon Aug 11 13:17:52 2008
@@ -173,6 +173,8 @@
 		"config" : $[
 		    "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes",
 		    "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes",
+		    "NETCONFIG_DNS_POLICY" : "STATIC",
+		    "NETCONFIG_DNS_STATIC_SERVERS" : "1.2.3.4 5.6.7.8 9.10.11.12",
 		],
 	    ],
 	],

Modified: trunk/dns-server/testsuite/tests/YaPIReadZones.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/YaPIReadZones.out?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/YaPIReadZones.out (original)
+++ trunk/dns-server/testsuite/tests/YaPIReadZones.out Mon Aug 11 13:17:52 2008
@@ -5,12 +5,12 @@
 Execute	.dns.named_conf_convert "/etc/named.conf" 0
 Execute	.target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""]
 Read	.sysconfig.named.NAMED_RUN_CHROOTED nil
-Read	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes"
-Read	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes"
+Read	.sysconfig.network.config.NETCONFIG_DNS_POLICY "auto"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Dir	.dns.named.value.options: ["directory", "notify"]
 Read	.dns.named.value.options.directory ["\"/var/lib/named\""]
 Read	.dns.named.value.options.notify ["no"]
+Read	.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS ""
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Read	.dns.named.value.acl []
 Read	.sysconfig.named.NAMED_CONF_INCLUDE_FILES nil

Modified: trunk/dns-server/testsuite/tests/YaPIReadZones.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/YaPIReadZones.ycp?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/YaPIReadZones.ycp (original)
+++ trunk/dns-server/testsuite/tests/YaPIReadZones.ycp Mon Aug 11 13:17:52 2008
@@ -172,6 +172,8 @@
 		"config" : $[
 		    "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes",
 		    "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes",
+		    "NETCONFIG_DNS_POLICY" : "auto",
+		    "NETCONFIG_DNS_STATIC_SERVERS" : "",
 		],
 	    ],
 	],

Modified: trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.out?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.out (original)
+++ trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.out Mon Aug 11 13:17:52 2008
@@ -5,12 +5,12 @@
 Execute	.dns.named_conf_convert "/etc/named.conf" 0
 Execute	.target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""]
 Read	.sysconfig.named.NAMED_RUN_CHROOTED nil
-Read	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes"
-Read	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes"
+Read	.sysconfig.network.config.NETCONFIG_DNS_POLICY "auto"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Dir	.dns.named.value.options: ["directory", "notify"]
 Read	.dns.named.value.options.directory ["\"/var/lib/named\""]
 Read	.dns.named.value.options.notify ["no"]
+Read	.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS ""
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Read	.dns.named.value.acl []
 Read	.sysconfig.named.NAMED_CONF_INCLUDE_FILES nil
@@ -29,9 +29,7 @@
 Write	.dns.named.value.options."notify" nil true
 Write	.dns.named.value.options."forwarders" nil true
 Write	.dns.named.value.options."dump-file" ["\"/var/log/named_dump.db\""] true
-Write	.dns.named.value.options."include" ["\"/etc/named.d/forwarders.conf\""] true
 Write	.dns.named.value.options."statistics-file" ["\"/var/log/named.stats\""] true
-Write	.dns.named-forwarders ["/etc/named.d/forwarders.conf", "{}"] true
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Write	.dns.named nil true
 Dir	.dns.named.value: ["acl", "options", "zone \"localhost\" in"]
@@ -43,13 +41,14 @@
 Write	.dns.named nil true
 Write	.sysconfig.named.NAMED_RUN_CHROOTED "yes" true
 Write	.sysconfig.named nil true
-Write	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" true
-Write	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" true
-Write	.sysconfig.network.config nil true
+Write	.sysconfig.network.config.NETCONFIG_DNS_POLICY "auto" true
 Read	.sysconfig.named.NAMED_INITIALIZE_SCRIPTS nil
 Write	.sysconfig.named.NAMED_INITIALIZE_SCRIPTS "" true
 Write	.sysconfig.named nil true
 Execute	.target.bash "/etc/init.d/named stop" 0
 Write	.target.ycp "/var/lib/YaST2/dns_server" $[] true
+Write	.sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true
+Write	.sysconfig.network.config nil true
+Execute	.target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""]
 Return	true
 Dump	==========================================================

Modified: trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.ycp?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.ycp (original)
+++ trunk/dns-server/testsuite/tests/YaPIWriteGlobalOptions.ycp Mon Aug 11 13:17:52 2008
@@ -160,6 +160,8 @@
 		"config" : $[
 		    "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes",
 		    "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes",
+		    "NETCONFIG_DNS_POLICY" : "auto",
+		    "NETCONFIG_DNS_STATIC_SERVERS" : "",
 		],
 	    ],
 	    "console" : $[ "CONSOLE_ENCODING" : "utf8" ],

Modified: trunk/dns-server/testsuite/tests/YaPIWriteZones.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/YaPIWriteZones.out?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/YaPIWriteZones.out (original)
+++ trunk/dns-server/testsuite/tests/YaPIWriteZones.out Mon Aug 11 13:17:52 2008
@@ -5,12 +5,12 @@
 Execute	.dns.named_conf_convert "/etc/named.conf" 0
 Execute	.target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""]
 Read	.sysconfig.named.NAMED_RUN_CHROOTED nil
-Read	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes"
-Read	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes"
+Read	.sysconfig.network.config.NETCONFIG_DNS_POLICY "STATIC"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Dir	.dns.named.value.options: ["directory", "notify"]
 Read	.dns.named.value.options.directory ["\"/var/lib/named\""]
 Read	.dns.named.value.options.notify ["no"]
+Read	.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "5.5.5.5 6.6.6.6 7.7.7.7"
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Read	.dns.named.value.acl []
 Read	.sysconfig.named.NAMED_CONF_INCLUDE_FILES nil
@@ -27,9 +27,8 @@
 Dir	.dns.named.value.options: ["directory", "notify"]
 Write	.dns.named.value.options."forwarders" nil true
 Write	.dns.named.value.options."directory" ["\"/var/lib/named\""] true
-Write	.dns.named.value.options."include" ["\"/etc/named.d/forwarders.conf\""] true
+Write	.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "5.5.5.5 6.6.6.6 7.7.7.7" true
 Write	.dns.named.value.options."notify" ["no"] true
-Write	.dns.named-forwarders ["/etc/named.d/forwarders.conf", "{}"] true
 Dir	.dns.named.section: ["options", "zone \"localhost\" in"]
 Write	.dns.named nil true
 Dir	.dns.named.value: ["acl", "options", "zone \"localhost\" in"]
@@ -41,9 +40,7 @@
 Write	.dns.named nil true
 Write	.sysconfig.named.NAMED_RUN_CHROOTED "yes" true
 Write	.sysconfig.named nil true
-Write	.sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" true
-Write	.sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" true
-Write	.sysconfig.network.config nil true
+Write	.sysconfig.network.config.NETCONFIG_DNS_POLICY "STATIC" true
 Read	.sysconfig.named.NAMED_INITIALIZE_SCRIPTS nil
 Write	.sysconfig.named.NAMED_INITIALIZE_SCRIPTS "" true
 Write	.sysconfig.named nil true
@@ -57,5 +54,8 @@
 Write	.dns.named.value."zone \"example.com\" in".type ["master"] true
 Execute	.target.bash "/etc/init.d/named stop" 0
 Write	.target.ycp "/var/lib/YaST2/dns_server" $[] true
+Write	.sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true
+Write	.sysconfig.network.config nil true
+Execute	.target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""]
 Return	true
 Dump	==========================================================

Modified: trunk/dns-server/testsuite/tests/YaPIWriteZones.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/YaPIWriteZones.ycp?rev=49930&r1=49929&r2=49930&view=diff
==============================================================================
--- trunk/dns-server/testsuite/tests/YaPIWriteZones.ycp (original)
+++ trunk/dns-server/testsuite/tests/YaPIWriteZones.ycp Mon Aug 11 13:17:52 2008
@@ -171,6 +171,8 @@
 		"config" : $[
 		    "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes",
 		    "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes",
+		    "NETCONFIG_DNS_POLICY" : "STATIC",
+		    "NETCONFIG_DNS_STATIC_SERVERS" : "5.5.5.5 6.6.6.6 7.7.7.7",
 		],
 	    ],
 	],

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r49930 - in /trunk/dns-server: package/ src/ testsuite/tests/

locilka＠svn.opensuse.org

tags

participants (1)