Author: kmachalkova Date: Thu Oct 30 16:52:37 2008 New Revision: 52761 URL: http://svn.opensuse.org/viewcvs/yast?rev=52761&view=rev Log: deprecated, only netconfig can modify resolv.conf now Modified: trunk/network/src/modules/DNS.ycp Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=52761&r1=52760&r2=52761&view=diff ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Thu Oct 30 16:52:37 2008 @@ -44,11 +44,6 @@ global list<string> nameservers = []; global list<string> searchlist = []; -/** - * Name of program that has claimed resolv.conf - */ -global string resolv_conf_process = ""; -global boolean resolv_conf_force = false; global string resolv_conf_policy = ""; @@ -236,19 +231,15 @@ y2milestone("hostname=%1", hostname); y2milestone("domain=%1", domain); - /* either no process or force update */ - boolean update_resolv = (resolv_conf_process == "" || resolv_conf_force == true); list <string> steps = [ /* Progress stage 1 */ _("Write hostname"), /* Progress stage 2 */ _("Run SuSEconfig"), - ]; - - if( update_resolv ) /* Progress stage 3 */ - steps = add(steps, _("Update /etc/resolv.conf")); + _("Update /etc/resolv.conf") + ]; /* Write dialog caption */ string caption = _("Saving Hostname and DNS Configuration"); @@ -287,21 +278,18 @@ SCR::Write(.target.string, resolv_conf, ""); */ - if( update_resolv ) { - /* Progress step 3/3 */ - ProgressNextStage(_("Updating /etc/resolv.conf ...")); + /* Progress step 3/3 */ + ProgressNextStage(_("Updating /etc/resolv.conf ...")); - SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_POLICY, resolv_conf_policy); - SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST, mergestring(searchlist, " ")); - SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS, mergestring(nameservers, " ")); - SCR::Write(.sysconfig.network.config, nil); + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_POLICY, resolv_conf_policy); + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST, mergestring(searchlist, " ")); + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS, mergestring(nameservers, " ")); + SCR::Write(.sysconfig.network.config, nil); - SCR::Execute(.target.bash, "/sbin/netconfig update"); - - sleep(sl); + SCR::Execute(.target.bash, "/sbin/netconfig update"); - } else y2milestone("resolv.conf changed by %1, leave untouched", resolv_conf_process); + sleep(sl); Progress::NextStage(); modified = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org