[yast-commit] r59667 - /branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp
Author: kmachalkova Date: Fri Nov 20 13:46:23 2009 New Revision: 59667 URL: http://svn.opensuse.org/viewcvs/yast?rev=59667&view=rev Log: Better handling of domain from XML + more logging Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp 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=59667&r1=59666&r2=59667&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 Fri Nov 20 13:46:23 2009 @@ -326,8 +326,10 @@ write_hostname = DefaultWriteHostname(); // user-defined <hostname> - if ( haskey(settings, "hostname") ) + if ( haskey(settings, "hostname") && haskey(settings, "domain")) { hostname = settings["hostname"]:""; + domain = settings["domain"]:"site"; + } else { // otherwise, check 1) install.inf 2) /etc/HOSTNAME ReadHostname(); @@ -335,11 +337,18 @@ ProposeHostname(); } - domain = settings["domain"]:"site"; nameservers = (list<string>) eval(settings["nameservers"]:[]); searchlist = (list<string>) eval(settings["searchlist"]:[]); modified = true; initialized = true; + + y2milestone("DNS Import:") + y2milestone("nameservers=%1", nameservers); + y2milestone("searchlist=%1", searchlist); + y2milestone("hostname=%1", hostname); + y2milestone("domain=%1", domain); + y2milestone("dhcp_hostname=%1, write_hostname=%2", dhcp_hostname, write_hostname); + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
kmachalkova@svn.opensuse.org