Author: juhliarik
Date: Wed Apr 16 15:21:01 2008
New Revision: 46737
URL: http://svn.opensuse.org/viewcvs/yast?rev=46737&view=rev
Log:
- added fix for activating partitions (DM-RAID)
- added fix for lilo and raid version
M bootloader/src/grub/misc.ycp
* (bnc #337742) - problem with DM-RAID
M bootloader/src/routines/misc.ycp
* (bnc #357897) - lilo and raid version
Modified:
trunk/bootloader/src/grub/misc.ycp
trunk/bootloader/src/routines/misc.ycp
Modified: trunk/bootloader/src/grub/misc.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=46737&r1=46736&r2=46737&view=diff
==============================================================================
--- trunk/bootloader/src/grub/misc.ycp (original)
+++ trunk/bootloader/src/grub/misc.ycp Wed Apr 16 15:21:01 2008
@@ -140,28 +140,37 @@
// });
// }
// }
- if (num != 0)
- {
- if (num > 4)
- {
- y2milestone ("Bootloader partition type is logical");
- map tm = Storage::GetTargetMap ();
- list<map> partitions = tm[mbr_dev, "partitions"]:[];
- foreach (map p, partitions, ``{
- if (p["type"]:nil == `extended)
- {
- num = p["nr"]:num;
- y2milestone ("Using extended partition %1 instead",
- num);
- }
- });
- }
+
+ // (bnc # 337742) - Unable to boot the openSUSE (32 and 64 bits) after installation
+ // if loader_device is disk device activate BootCommon::BootPartitionDevice
+ if (num == 0)
+ {
+ y2milestone ("loader_device is disk device");
+ p_dev = Storage::GetDiskPartition (BootCommon::BootPartitionDevice);
+ num = BootCommon::myToInteger( p_dev["nr"]:nil );
+ }
+
+ if (num > 4)
+ {
+ y2milestone ("Bootloader partition type is logical");
+ map tm = Storage::GetTargetMap ();
+ list<map> partitions = tm[mbr_dev, "partitions"]:[];
+ foreach (map p, partitions, ``{
+ if (p["type"]:nil == `extended)
+ {
+ num = p["nr"]:num;
+ y2milestone ("Using extended partition %1 instead",num);
+ }
+ });
}
+
map