Author: locilka Date: Wed Oct 15 14:20:16 2008 New Revision: 52239 URL: http://svn.opensuse.org/viewcvs/yast?rev=52239&view=rev Log: - Fixed Service::Finetune() to call insserv even if no runlevels to enable an init script in has been selected (bnc #435182). - 2.17.40 Modified: trunk/yast2/VERSION trunk/yast2/library/runlevel/src/Service.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=52239&r1=52238&r2=52239&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Oct 15 14:20:16 2008 @@ -1 +1 @@ -2.17.39 +2.17.40 Modified: trunk/yast2/library/runlevel/src/Service.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/Service.ycp?rev=52239&r1=52238&r2=52239&view=diff ============================================================================== --- trunk/yast2/library/runlevel/src/Service.ycp (original) +++ trunk/yast2/library/runlevel/src/Service.ycp Wed Oct 15 14:20:16 2008 @@ -232,13 +232,20 @@ return false; } - if (rls != "") - { - map ret = (map)SCR::Execute (.target.bash_output, - sformat ("/sbin/insserv -f %2/%1,start=%3", - name, init_d, rls)); - if (0 != ret["exit"]:-1) - { + // bnc #435182 + string command = (rls == "" ? + // removing completely + sformat ("/sbin/insserv -f -r %2/%1", name, init_d) + : + // removing completely, finetuning only those we want + sformat ("/sbin/insserv -f -r %2/%1; /sbin/insserv -f %2/%1,start=%3", name, init_d, rls) + ); + + y2milestone ("Calling %1", command); + + map ret = (map)SCR::Execute (.target.bash_output, command); + + if (0 != ret["exit"]:-1) { // Error message. // %1 is a name of an init script in /etc/init.d, // Enabling means that the service should start @@ -249,8 +256,8 @@ name, rls, ret["stderr"]:""); y2error (1, error_msg); return false; - } } + return true; } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=52239&r1=52238&r2=52239&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Oct 15 14:20:16 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 15 14:15:53 CEST 2008 - locilka@suse.cz + +- Fixed Service::Finetune() to call insserv even if no runlevels + to enable an init script in has been selected (bnc #435182). +- 2.17.40 + +------------------------------------------------------------------- Mon Oct 13 12:53:12 CEST 2008 - lslezak@suse.cz - fixed syntax error in media change callback (bnc#434721) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org