Author: snwint Date: Mon Aug 22 16:35:40 2011 New Revision: 65384 URL: http://svn.opensuse.org/viewcvs/yast?rev=65384&view=rev Log: - don't try to activate partition if boot partition is not on mbr disk Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes?rev=65384&r1=65383&r2=65384&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Aug 22 16:35:40 2011 @@ -2,6 +2,7 @@ Mon Aug 22 16:33:09 CEST 2011 - snwint@suse.de - stop proposing to write to floppy +- don't try to activate partition if boot partition is not on mbr disk ------------------------------------------------------------------- Fri Aug 19 17:48:21 CEST 2011 - snwint@suse.de Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp?rev=65384&r1=65383&r2=65384&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp Mon Aug 22 16:35:40 2011 @@ -144,11 +144,18 @@ // (bnc # 337742) - Unable to boot the openSUSE (32 and 64 bits) after installation // if loader_device is disk device activate BootCommon::BootPartitionDevice + // - only if boot partition is on mbr device if (num == 0) { - y2milestone ("loader_device is disk device"); p_dev = Storage::GetDiskPartition (BootCommon::BootPartitionDevice); - num = BootCommon::myToInteger( p_dev["nr"]:nil ); + string p_disk = p_dev["disk"]:""; + integer p_num = BootCommon::myToInteger( p_dev["nr"]:nil ); + y2milestone ("loader_device is disk device: mbr = %1, dev = %2, num = %3, activate = %4", + mbr_dev, p_disk, p_num, p_disk == mbr_dev + ); + // as it's not really possible to say 'no', we return num = 0 which will + // eventually result in not activating the partition - dead ugly, I know + if (p_disk == mbr_dev) { num = p_num; } } if (num > 4) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org