Author: odabrunz Date: Tue Sep 18 10:03:27 2007 New Revision: 40952 URL: http://svn.opensuse.org/viewcvs/yast?rev=40952&view=rev Log: - update the default entry during update when the comment with the former default exists, even if the current default is valid (#309837) Modified: trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=40952&r1=40951&r2=40952&view=diff ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Tue Sep 18 10:03:27 2007 @@ -376,9 +376,11 @@ /** * Fix global section of lilo-like bootloader * - * This currently only tries to fix the "default" key in case the referenced - * section does not exist anymore. An empty "default" value is not changed, - * because this means that no default is wanted. + * This currently only tries to fix the "default" key if necessary. It is when + * the referenced section does not exist anymore or during a system update when + * a special comment in the bootloader configuration tells us that we have to + * update the "default" key. An empty "default" value is not changed, because + * this means that no default is wanted. * * If we need to fix the "default" key we take the following steps: * @@ -413,7 +415,8 @@ first = label; }); - if (exists) + if (exists && + (! Mode::update() || globals["former_default_image_flavor"]:nil == nil)) return; // need to fix "default" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org