Author: juhliarik
Date: Tue Nov 25 10:04:19 2008
New Revision: 53565
URL: http://svn.opensuse.org/viewcvs/yast?rev=53565&view=rev
Log:
added fix for recreating device map and updated proposal if boot device
is on logical partition
Modified:
trunk/bootloader/src/clients/bootloader_proposal.ycp
trunk/bootloader/src/generic/device_map_edit_widget.ycp
trunk/bootloader/src/grub/misc.ycp
trunk/bootloader/src/modules/BootCommon.ycp
trunk/bootloader/src/modules/Bootloader.ycp
Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_proposal.ycp?rev=53565&r1=53564&r2=53565&view=diff
==============================================================================
--- trunk/bootloader/src/clients/bootloader_proposal.ycp (original)
+++ trunk/bootloader/src/clients/bootloader_proposal.ycp Tue Nov 25 10:04:19 2008
@@ -52,7 +52,7 @@
// changes relevant to the yast2-bootloader settings are made
// through Storage, so the change time of Storage data should be
// sufficient.
- && Bootloader::cached_settings_base_data_change_time == Storage::GetTargetChangeTime())
+ && BootCommon::cached_settings_base_data_change_time == Storage::GetTargetChangeTime())
// FIXME: has the software selection changed?: esp. has the
@@ -217,7 +217,7 @@
// cache the values
Bootloader::cached_settings = Bootloader::Export();
- Bootloader::cached_settings_base_data_change_time = Storage::GetTargetChangeTime();
+ BootCommon::cached_settings_base_data_change_time = Storage::GetTargetChangeTime();
Bootloader::cached_proposal = ret;
}
// This is a request to start some dialog and interact with the user to set
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=53565&r1=53564&r2=53565&view=diff
==============================================================================
--- trunk/bootloader/src/generic/device_map_edit_widget.ycp (original)
+++ trunk/bootloader/src/generic/device_map_edit_widget.ycp Tue Nov 25 10:04:19 2008
@@ -44,7 +44,7 @@
`opt (`notify, `immediate),
// selectionn box label
_("D&isks"), []),
- Mode::config ()
+ (Mode::config () || Mode::installation())
? `HBox (
`HStretch (),
`PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()),
Modified: trunk/bootloader/src/grub/misc.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=53565&r1=53564&r2=53565&view=diff
==============================================================================
--- trunk/bootloader/src/grub/misc.ycp (original)
+++ trunk/bootloader/src/grub/misc.ycp Tue Nov 25 10:04:19 2008
@@ -595,7 +595,10 @@
// if is primary, store bootloader there
integer exit = 0;
- if (boot_partition_is_on_mbr_disk && ! is_logical)
+ // there was check if boot device is on logical partition
+ // IMO it is good idea check MBR also in this case
+ // see bug #279837 comment #53
+ if (boot_partition_is_on_mbr_disk)
{
selected_location = `boot;
BootCommon::globals["activate"] = "true";
@@ -933,8 +936,9 @@
y2milestone("(2) globals: %1", BootCommon::globals);
// refresh device map
- if (BootCommon::device_mapping == nil
- || size (BootCommon::device_mapping) == 0)
+ if ((BootCommon::device_mapping == nil)
+ || (size (BootCommon::device_mapping) == 0)
+ || (BootCommon::cached_settings_base_data_change_time != Storage::GetTargetChangeTime()))
{
grub_ProposeDeviceMap ();
}
Modified: trunk/bootloader/src/modules/BootCommon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=53565&r1=53564&r2=53565&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootCommon.ycp (original)
+++ trunk/bootloader/src/modules/BootCommon.ycp Tue Nov 25 10:04:19 2008
@@ -67,6 +67,12 @@
global list