Author: kmachalkova Date: Wed Sep 5 14:29:25 2007 New Revision: 40767 URL: http://svn.opensuse.org/viewcvs/yast?rev=40767&view=rev Log: Save nameserver entry at the end of 1st stage of installation even if no search domain is present in install.inf Modified: trunk/network/src/clients/save_network.ycp Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=40767&r1=40766&r2=40767&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Sep 5 14:29:25 2007 @@ -263,8 +263,15 @@ } else y2warning("No routing information in install.inf"); // create resolv.conf only for static configuration - if (size(InstallInf["domain"]:"")>0 && size(InstallInf["nameserver"]:"")>0){ - string text=sformat("domain %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:""); + if (size(InstallInf["nameserver"]:"")>0){ + string text = ""; + //Enter search domain data only if present + if( size(InstallInf["domain"]:"") > 0) + text=sformat("search %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:""); + else + //If we don't have search domain data, skip 'search' field, + //do not leave out 'nameserver' completely - #298001 + text = sformat("nameserver %1\n", InstallInf["nameserver"]:"") y2milestone("Write resolv.conf content: %1", text); SCR::Write(.target.string, "/etc/resolv.conf", text); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org