Author: juhliarik Date: Tue Apr 28 16:39:07 2009 New Revision: 57010 URL: http://svn.opensuse.org/viewcvs/yast?rev=57010&view=rev Log: disable checking of thinkpad sequence Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/i386.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=57010&r1=57009&r2=57010&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Apr 28 16:39:07 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 28 16:37:43 CEST 2009 - juhliarik@suse.cz + +- disable checking thinkpad sequence in MBR also save content of + MBR (bnc#464485) + +------------------------------------------------------------------- Wed Apr 22 15:47:26 CEST 2009 - jreidinger@suse.cz - code clean Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=57010&r1=57009&r2=57010&view=diff ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Tue Apr 28 16:39:07 2009 @@ -311,6 +311,15 @@ "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", device, "/boot/backup_mbr")); + // save thinkpad MBR + if (BootCommon::ThinkPadMBR(device)) + { + string device_file_path_thinkpad = device_file_path + "thinkpadMBR"; + y2milestone("Backup thinkpad MBR"); + SCR::Execute(.target.bash, sformat ( + "cp %1 %2 2>&1", device_file_path, device_file_path_thinkpad)); + } + } } Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=57010&r1=57009&r2=57010&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Tue Apr 28 16:39:07 2009 @@ -299,6 +299,7 @@ global map CreateLinuxSection (string title); global string UpdateSerialConsole (string append, string console); global string examineMBR (string device); +global boolean ThinkPadMBR (string disk); /* * help message and dscription definitions Modified: trunk/bootloader/src/routines/i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/i386.ycp?rev=57010&r1=57009&r2=57010&view=diff ============================================================================== --- trunk/bootloader/src/routines/i386.ycp (original) +++ trunk/bootloader/src/routines/i386.ycp Tue Apr 28 16:39:07 2009 @@ -115,8 +115,14 @@ * @return boolean true to keep the contents */ global boolean KeepMBR (string disk) { - if (ThinkPadMBR (disk)) - return true; + + // FIXME: see bug #464485 there is problem with detection of + // MBR the 3rd byte is 0 after recovery thinkpad notebook with + // recovery CD, next missing cooperate with Lenovo there also + // missing any specification about Lenovo's changes in MBR + + y2milestone("Skip checking of MBR for thinkpad sequence"); + return false; } Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=57010&r1=57009&r2=57010&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Tue Apr 28 16:39:07 2009 @@ -44,6 +44,7 @@ global map Md2Partitions (string md_device); global void DetectDisks (); global string getBootPartition(); + /** * return printable name of bootloader @@ -775,6 +776,15 @@ "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", device, "/boot/backup_mbr")); + // save thinkpad MBR + if (BootCommon::ThinkPadMBR(device)) + { + string device_file_path_thinkpad = device_file_path + "thinkpadMBR"; + y2milestone("Backup thinkpad MBR"); + SCR::Execute(.target.bash, sformat ( + "cp %1 %2 2>&1", device_file_path, device_file_path_thinkpad)); + } + } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org