Author: kmachalkova Date: Fri Mar 12 12:36:48 2010 New Revision: 61304 URL: http://svn.opensuse.org/viewcvs/yast?rev=61304&view=rev Log: More logging & checking + changes + bump Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=61304&r1=61303&r2=61304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Fri Mar 12 12:36:48 2010 @@ -1 +1 @@ -2.17.125 +2.17.126 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=61304&r1=61303&r2=61304&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Fri Mar 12 12:36:48 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 12 10:42:43 CET 2010 - kmachalkova@suse.cz + +- In [auto]installation, prefer hostname from install.inf. Convert + to FQDN if it is an IP address (bnc#556613, bnc#502715) +- 2.17.126 + +------------------------------------------------------------------- Thu Mar 11 10:19:16 CET 2010 - mzugec@suse.cz - L3: update device name via which is system installed by AY 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=61304&r1=61303&r2=61304&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 Mar 12 12:36:48 2010 @@ -138,16 +138,19 @@ // In installation (standard, or AutoYaST one), prefer /etc/install.inf // (because HOSTNAME comes with netcfg.rpm already, #144687) if( (Mode::installation() || Mode::autoinst()) && - SCR::Read(.target.size, "/etc/install.inf") > 0) { + SCR::Read(.target.size, "/etc/install.inf") > 0) { string install_inf_hostname = (string) SCR::Read(.etc.install_inf.Hostname); + y2milestone("Got %1 from install.inf", install_inf_hostname); - //if the name is actually IP, try to resolve it (bnc#556613, bnc#435649) - if (IP::Check (install_inf_hostname)) - { - fqhostname = ResolveIP( install_inf_hostname ); - } - else - fqhostname = install_inf_hostname; + if ( (size(install_inf_hostname) > 0) { + //if the name is actually IP, try to resolve it (bnc#556613, bnc#435649) + if ( IP::Check(install_inf_hostname) ) { + fqhostname = ResolveIP( install_inf_hostname ); + y2milestone("Got %1 after resolving IP from install.inf", fqhostname); + } + else + fqhostname = install_inf_hostname; + } } // /etc/HOSTNAME @@ -159,6 +162,7 @@ fqhostname = (string) SCR::Read (.target.string, "/etc/HOSTNAME"); //avoid passing nil argument when we get non-\n-terminated string (#445531) fqhostname = String::FirstChunk( fqhostname, "\n" ); + y2milestone("Got %1 from /etc/HOSTNAME", fqhostname); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org