Author: juhliarik
Date: Mon May 18 17:46:56 2009
New Revision: 57241
URL: http://svn.opensuse.org/viewcvs/yast?rev=57241&view=rev
Log:
added fixes for soft-raids
Modified:
trunk/bootloader/package/yast2-bootloader.changes
trunk/bootloader/src/clients/bootloader_proposal.ycp
trunk/bootloader/src/grub/misc.ycp
trunk/bootloader/src/modules/BootSupportCheck.ycp
Modified: trunk/bootloader/package/yast2-bootloader.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=57241&r1=57240&r2=57241&view=diff
==============================================================================
--- trunk/bootloader/package/yast2-bootloader.changes (original)
+++ trunk/bootloader/package/yast2-bootloader.changes Mon May 18 17:46:56 2009
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon May 18 17:45:52 CEST 2009 - juhliarik@suse.cz
+
+- added fix for changing device map in y2-bootloader (bnc#497944)
+- added warning message if there is not valid configuration for
+ soft-raid (bnc#501043)
+
+-------------------------------------------------------------------
Thu May 7 10:05:02 CEST 2009 - juhliarik@suse.cz
- added fix for checking soft-raid devices in device.map
Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_proposal.ycp?rev=57241&r1=57240&r2=57241&view=diff
==============================================================================
--- trunk/bootloader/src/clients/bootloader_proposal.ycp (original)
+++ trunk/bootloader/src/clients/bootloader_proposal.ycp Mon May 18 17:46:56 2009
@@ -120,8 +120,6 @@
]
);
}
-
-
}
//F#300779 - Install diskless client (NFS-root)
Modified: trunk/bootloader/src/grub/misc.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=57241&r1=57240&r2=57241&view=diff
==============================================================================
--- trunk/bootloader/src/grub/misc.ycp (original)
+++ trunk/bootloader/src/grub/misc.ycp Mon May 18 17:46:56 2009
@@ -185,9 +185,24 @@
list underlying_devs = [];
list<string> devs = [];
+ list<string> boot_devices = [];
+
+ // bnc#494630 - add also boot partitions from soft-raids
+ string boot_device = BootCommon::getBootPartition();
+ if (substring (boot_device, 0, 7) == "/dev/md")
+ {
+ boot_devices = add(boot_devices, boot_device);
+ foreach (string dev, BootCommon::GetBootloaderDevices(), {
+ boot_devices = add(boot_devices, dev);
+ });
+ } else {
+
+ boot_devices = BootCommon::GetBootloaderDevices();
+ }
+
// get a list of all bootloader devices or their underlying soft-RAID
// devices, if necessary
- underlying_devs = maplist (string dev, BootCommon::GetBootloaderDevices(), {
+ underlying_devs = maplist (string dev, boot_devices, {
md = BootCommon::Md2Partitions(dev);
if ( size(md) > 0 ) {
devs = maplist (string k, integer v, md, ``(k));
Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSupportCheck.ycp?rev=57241&r1=57240&r2=57241&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootSupportCheck.ycp (original)
+++ trunk/bootloader/src/modules/BootSupportCheck.ycp Mon May 18 17:46:56 2009
@@ -171,58 +171,74 @@
global boolean check_BootDevice()
{
- boolean result = true;
- string boot_device = "";
+ boolean result = true;
+ string boot_device = "";
- map devices = (map)Storage::GetTargetMap();
+ map devices = (map)Storage::GetTargetMap();
+ boot_device = BootCommon::getBootPartition();
- boot_device = BootCommon::getBootPartition();
+ // if (BootStorage::BootPartitionDevice == BootStorage::RootPartitionDevice)
+ // AddNewProblem (_("Doesn't exist separete /boot partition"));
- // if (BootStorage::BootPartitionDevice == BootStorage::RootPartitionDevice)
- // AddNewProblem (_("Doesn't exist separete /boot partition"));
-
- boolean found_boot = false;
- // check if boot device is on raid0
- if (boot_device != "")
+ boolean found_boot = false;
+ // check if boot device is on raid0
+ if (boot_device != "")
+ {
+ foreach (string k, map v, devices,
{
- foreach (string k, map v, devices,
+ foreach (map p, (list<map>)(v["partitions"]:[]),
+ {
+ if (p["device"]:"" == boot_device)
{
- foreach (map p, (list<map>)(v["partitions"]:[]),
+ if ((p["raid_type"]:"" != "raid1") && (p["type"]:nil ==`sw_raid))
+ {
+ AddNewProblem (sformat(_("The boot device is on raid type: %1. System will not boot."),
+ p["raid_type"]:""));
+ y2error("The boot device: %1 is on raid type: %2", boot_device, p["raid_type"]:"");
+ result = false;
+ break;
+ } else {
+ // bnc#501043 added check for valid configuration
+ if ((p["raid_type"]:"" == "raid1") && (p["type"]:nil ==`sw_raid))
{
- if (p["device"]:"" == boot_device)
- {
- if ((p["raid_type"]:"" != "raid1") && (p["type"]:nil ==`sw_raid))
- {
- AddNewProblem (sformat(_("The boot device is on raid type: %1. System will not boot."), p["raid_type"]:""));
- y2error("The boot device: %1 is on raid type: %2", boot_device, p["raid_type"]:"");
- result = false;
- break;
- } else {
- found_boot = true;
- y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:"");
- //break;
- }
-
- // check if /boot directory is on supported filesystem
- if (p["used_fs"]:nil == `xfs) {
- AddNewProblem (_("The /boot directory is on an XFS filesystem. System may not boot."));
- y2error ("The /boot directory is on an XFS filesystem");
- result = false;
- break;
- } else {
- found_boot = true;
- y2milestone ("/boot filesystem is OK");
- break;
- }
-
- }
- });
- if ((!result) || (found_boot))
- break;
- });
- }
- return result;
+ if ((tolower(p["fstype"]:"") == "md raid") &&
+ (BootCommon::globals["boot_mbr"]:"false" != "true"))
+ {
+ result = false;
+ AddNewProblem (_("The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"));
+ y2error("Booting from soft-raid: %1 and bootloader setting are not valid: %2",
+ p, BootCommon::globals);
+ } else {
+ found_boot = true;
+ y2milestone("Valid configuration for soft-raid");
+ }
+
+ } else {
+ found_boot = true;
+ y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:"");
+ }
+ }
+ // check if /boot directory is on supported filesystem
+ if (p["used_fs"]:nil == `xfs)
+ {
+ AddNewProblem (_("The /boot directory is on an XFS filesystem. System may not boot."));
+ y2error ("The /boot directory is on an XFS filesystem");
+ result = false;
+ break;
+ } else {
+ found_boot = true;
+ y2milestone ("/boot filesystem is OK");
+ break;
+ }
+
+ }
+ });
+ if ((!result) || (found_boot))
+ break;
+ });
+ }
+ return result;
}
/**
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
