Author: kmachalkova Date: Wed Feb 18 16:57:37 2009 New Revision: 55597 URL: http://svn.opensuse.org/viewcvs/yast?rev=55597&view=rev Log: Save complete FQDN into /etc/HOSTNAME if specified by 'hostname=' Linuxrc parameter, do not cut off domain name (bnc#476208) Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/package/yast2-network.changes?rev=55597&r1=55596&r2=55597&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Wed Feb 18 16:57:37 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 18 16:55:01 CET 2009 - kmachalkova@suse.cz + +- Save complete FQDN into /etc/HOSTNAME if specified by 'hostname=' + Linuxrc parameter, do not cut off domain name (bnc#476208) + +------------------------------------------------------------------- Fri Feb 13 18:17:22 CET 2009 - mzugec@suse.de - workaround for automatic configuration detection to not show Modified: branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp?rev=55597&r1=55596&r2=55597&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Wed Feb 18 16:57:37 2009 @@ -123,8 +123,12 @@ string hostname = InstallInf["hostname"]:""; if(hostname != "" && !IP::Check (hostname)) { list split = Hostname::SplitFQ(hostname); - InstallInf["hostname"] = split[0]:hostname; - InstallInf["domain"] = split[1]:""; + + // hostname is supposed to be FQDN (http://en.opensuse.org/Linuxrc) + // so we should not cut off domain name ... anyway remember domain, + // use it as fallback below, if there is no DNS search domain (#476208) + if (size(split) > 1) + InstallInf["fqdomain"] = split[1]:""; } else { @@ -307,7 +311,7 @@ // create hostname if (size(InstallInf["hostname"]:"")>0){ - y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); + y2milestone("Write HOSTNAME: %1", InstallInf["hostname"]:""); SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); } @@ -337,12 +341,19 @@ //'netconfig' will do the job later on network startup (FaTE #303618) SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS, serverlist); y2milestone("Writing static nameserver entry: %1", InstallInf["nameserver"]:""); + //Enter search domain data only if present if( size(InstallInf["domain"]:"") > 0) { SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST, InstallInf["domain"]:""); y2milestone("Writing static searchlist entry: %1", InstallInf["domain"]:""); } + else if ( size(InstallInf["fqdomain"]:"") > 0) + { + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST, InstallInf["fqdomain"]:""); + y2milestone("No DNS search domain defined, using FQ domain name %1 as a fallback", InstallInf["fqdomain"]:""); + } + //We're done. It is OK not to touch NETCONFIG_DNS_POLICY now as it is set to 'auto' by default //and user did not have a chance to modify it up to now SCR::Write(.sysconfig.network.config, nil); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org