Author: juhliarik Date: Tue Jan 20 14:13:26 2009 New Revision: 54808 URL: http://svn.opensuse.org/viewcvs/yast?rev=54808&view=rev Log: added fix to problem with calling parted each time - "Unable to boot after making changes to boot loader" Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/scripts/tp_mbr trunk/bootloader/src/generic/device_map_edit_widget.ycp trunk/bootloader/src/generic/global_options_widget.ycp trunk/bootloader/src/modules/BootGRUB.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=54808&r1=54807&r2=54808&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Jan 20 14:13:26 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 20 14:11:38 CET 2009 - juhliarik@suse.cz + +- added fix for problem with calling parted each time when + yast2-bootloader is called (bnc #461613, #357290) + +------------------------------------------------------------------- Thu Jan 15 15:28:38 CET 2009 - juhliarik@suse.cz - added fix for problem with lines_cache_id == "" -it is cause of Modified: trunk/bootloader/scripts/tp_mbr URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/scripts/tp_mbr?rev=54808&r1=54807&r2=54808&view=diff ============================================================================== --- trunk/bootloader/scripts/tp_mbr (original) +++ trunk/bootloader/scripts/tp_mbr Tue Jan 20 14:13:26 2009 @@ -80,7 +80,6 @@ close F; - # verify crc if($mbr[6] == 0) { Modified: trunk/bootloader/src/generic/device_map_edit_widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/device_map_edit_widget.ycp?rev=54808&r1=54807&r2=54808&view=diff ============================================================================== --- trunk/bootloader/src/generic/device_map_edit_widget.ycp (original) +++ trunk/bootloader/src/generic/device_map_edit_widget.ycp Tue Jan 20 14:13:26 2009 @@ -174,7 +174,7 @@ return $[ d : sformat ("hd%1", hex_index) ]; }) ); - + BootCommon::location_changed = true; } return (symbol)ret; } Modified: trunk/bootloader/src/generic/global_options_widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/global_options_widget.ycp?rev=54808&r1=54807&r2=54808&view=diff ============================================================================== --- trunk/bootloader/src/generic/global_options_widget.ycp (original) +++ trunk/bootloader/src/generic/global_options_widget.ycp Tue Jan 20 14:13:26 2009 @@ -83,6 +83,10 @@ symbol GOW_Handle (string key, map event) { y2milestone("Called for key %1 through event %2", key, event); // FIXME: is that the right way? "path" widget managed right? + // bnc #461613 - Unable to boot after making changes to boot loader + // bnc #357290 - module rewrites grub generic code when leaving with no changes, which may corrupt grub + if (event["EventReason"]:"" == "ValueChanged") + BootCommon::location_changed = true; return generic_Handle (key, event); } Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=54808&r1=54807&r2=54808&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Tue Jan 20 14:13:26 2009 @@ -737,9 +737,12 @@ * @return boolean true on success */ global define boolean Write () ``{ - grub_updateMBR (); + boolean ret = BootCommon::UpdateBootloader (); if (BootCommon::location_changed || BootCommon::InstallingToFloppy ()) { + // bnc #461613 - Unable to boot after making changes to boot loader + // bnc #357290 - module rewrites grub generic code when leaving with no changes, which may corrupt grub + grub_updateMBR (); if (BootCommon::InstallingToFloppy ()) { if (! saveToFLoppyPopup ()) { y2error ("Preparing floppy disk failed."); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org