Author: mvidner Date: Thu Aug 4 16:16:48 2011 New Revision: 65221 URL: http://svn.opensuse.org/viewcvs/yast?rev=65221&view=rev Log: - inst_hostname: do write the randomized /etc/HOSTNAME if left unchanged by user (bnc#695803). - Allow empty domain in autoyast profiles again (bnc#677471). svn merge -c65220 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/network . Modified: trunk/network/ (props changed) trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/installation/inst_hostname.ycp trunk/network/src/modules/DNS.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=65221&r1=65220&r2=65221&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Aug 4 16:16:48 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=65221&r1=65220&r2=65221&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Aug 4 16:16:48 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 3 17:09:21 CEST 2011 - mvidner@suse.cz + +- inst_hostname: do write the randomized /etc/HOSTNAME if left + unchanged by user (bnc#695803). +- Allow empty domain in autoyast profiles again (bnc#677471). +- 2.21.1 + +------------------------------------------------------------------- Fri Jul 22 17:49:47 CEST 2011 - mvidner@suse.cz - Support biosdevname=1 NIC naming scheme: don't write mac-based udev Modified: trunk/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_hostname.ycp?rev=65221&r1=65220&r2=65221&view=diff ============================================================================== --- trunk/network/src/installation/inst_hostname.ycp (original) +++ trunk/network/src/installation/inst_hostname.ycp Thu Aug 4 16:16:48 2011 @@ -49,12 +49,6 @@ Wizard::SetDesktopIcon("dns"); ret = HostnameDialog (); } -//but we need to force writing /etc/HOSTNAME in such case -//(#383336) -else -{ - DNS::modified = true; -} if (ret == `next) { Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=65221&r1=65220&r2=65221&view=diff ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Thu Aug 4 16:16:48 2011 @@ -189,6 +189,7 @@ { srandom (); hostname = "linux-" + String::Random (4); // #157107 + modified = true; } } @@ -346,9 +347,9 @@ write_hostname = DefaultWriteHostname(); // user-defined <hostname> - if ( haskey(settings, "hostname") && haskey(settings, "domain")) { + if ( haskey(settings, "hostname")) { hostname = settings["hostname"]:""; - domain = settings["domain"]:"site"; + domain = settings["domain"]:""; // empty is not a bug, bnc#677471 } else { // otherwise, check 1) install.inf 2) /etc/HOSTNAME -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org