Author: locilka Date: Tue Mar 9 12:56:21 2010 New Revision: 61196 URL: http://svn.opensuse.org/viewcvs/yast?rev=61196&view=rev Log: - Skipping starting boot.* scripts in services_proposal, they still have to be enabled though (BNC #583773). Modified: trunk/runlevel/package/yast2-runlevel.changes trunk/runlevel/src/services_proposal.ycp Modified: trunk/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.changes?rev=61196&r1=61195&r2=61196&view=diff ============================================================================== --- trunk/runlevel/package/yast2-runlevel.changes (original) +++ trunk/runlevel/package/yast2-runlevel.changes Tue Mar 9 12:56:21 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 9 12:53:14 CET 2010 - locilka@suse.cz + +- Skipping starting boot.* scripts in services_proposal, they still + have to be enabled though (BNC #583773). + ------------------------------------------------------------------ Wed Feb 10 17:17:14 CET 2010 - locilka@suse.cz Modified: trunk/runlevel/src/services_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/services_proposal.ycp?rev=61196&r1=61195&r2=61196&view=diff ============================================================================== --- trunk/runlevel/src/services_proposal.ycp (original) +++ trunk/runlevel/src/services_proposal.ycp Tue Mar 9 12:56:21 2010 @@ -296,20 +296,27 @@ services = (list <string>) union (all_needed_services, services); foreach (string service, services, { + // Check and enable service + if (Service::Enabled (service) != true && Service::Enable (service) != true) { + y2error ("Unable to enable service %1", service); + Report::Error (sformat(_("Cannot enable service %1"), service)); + ret = false; + } + + // All boot.* scripts are skipped + // See BNC #583773 + if (regexpmatch (service, "^boot\..*")) { + y2warning ("Skipping service %1", service); + return; + } + + // Check and start service if (Service::Status (service) == -1) { y2error ("Service name %1 is unknown", service); Report::Error (sformat (_("Unable to start and enable service %1. Service is not installed."), service)); ret = false; } else { - // Check and enable service - if (Service::Enabled (service) != true && Service::Enable (service) != true) { - y2error ("Unable to enable service %1", service); - Report::Error (sformat(_("Cannot enable service %1"), service)); - ret = false; - } - - // Check and start service if (Service::RunInitScriptWithTimeOut (service, "status") != 0 && Service::RunInitScriptWithTimeOut (service, "start") != 0) { y2error ("Unable to start service %1", service); Report::Error (sformat(_("Cannot start service %1"), service)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org