commit c4c0edf8fe279bf7805a53e21558988add8fae01
author Casey Dahlin <sadmac@google.com> Wed Jun 01 21:57:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 21:57:04 2016 +0000
tree 996bd6cdbbbbc648397eedd4c0536a53c50b9653
parent c3ae67c35590ce0ed05e70599fdc29633e9f700c
parent da251d3dbf20d3376715b3309ed15b5fc4bae7b4

Set MBR bootloader code to busy loop on x86
am: da251d3dbf

* commit 'da251d3dbf20d3376715b3309ed15b5fc4bae7b4':
  Set MBR bootloader code to busy loop on x86

Change-Id: Ibb715091d9a6bce288bf76da07f1922ba88cb8b3

bpttool

diff --git a/bpttool b/bpttool
index 1f1bfef..861fe6b 100755
--- a/bpttool
+++ b/bpttool
@@ -552,7 +552,7 @@
     lba_end = settings.disk_size/DISK_SECTOR_SIZE - 1
     start_chs = self._lba_to_chs(lba_start)
     end_chs = self._lba_to_chs(lba_end)
-    pmbr = struct.pack('<446x'     # Padding to get to offset 446 (0x1be).
+    pmbr = struct.pack('<446s'     # Bootloader code
                        'B'         # Status.
                        'BBB'       # CHS start.
                        'B'         # Partition type.
@@ -561,6 +561,7 @@
                        'I'         # Number of sectors in partition.
                        '48x'       # Padding to get to offset 510 (0x1fe).
                        'BB',       # Boot signature.
+                       '\xfa\xeb\xfe', # cli ; jmp $ (x86)
                        0x00,
                        start_chs[0], start_chs[1], start_chs[2],
                        0xee,       # MBR Partition Type: GPT protective MBR.

test/expected_json_stacked_change_flags.bin

diff --git a/test/expected_json_stacked_change_flags.bin b/test/expected_json_stacked_change_flags.bin
index 602e5c5..2fb6ee3 100644
--- a/test/expected_json_stacked_change_flags.bin
+++ b/test/expected_json_stacked_change_flags.bin
Binary files differ