From 61b0b333f0010619a0489555f7ab9728a264baf7 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Sat, 25 Aug 2018 07:52:46 +0000
Subject: [PATCH] ota: skeep mbr

---
 buildroot-external/misc/rauc-hook       | 7 ++-----
 buildroot-external/scripts/hdd-image.sh | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/buildroot-external/misc/rauc-hook b/buildroot-external/misc/rauc-hook
index 30957b6df..851472e94 100755
--- a/buildroot-external/misc/rauc-hook
+++ b/buildroot-external/misc/rauc-hook
@@ -23,11 +23,8 @@ if [ "${RAUC_SLOT_CLASS}" = "spl" ]; then
     if sfdisk -dq ${DEVICE_ROOT} | grep -q 'label: gpt'; then
         dd if=${RAUC_IMAGE_NAME} of=${DEVICE_ROOT} conv=notrunc bs=512 seek=2 skip=2
     else
-        BACKUP_MBR="/tmp/mbr-backup.bin"
-
-        dd if=${DEVICE_ROOT} of=${BACKUP_MBR} bs=1 count=72 skip=440
-        dd if=${RAUC_IMAGE_NAME} of=${DEVICE_ROOT} conv=notrunc bs=512
-        dd if=${BACKUP_MBR} of=${DEVICE_ROOT} conv=notrunc bs=1 skip=440
+        dd if=${RAUC_IMAGE_NAME} of=${DEVICE_ROOT} conv=notrunc bs=1 count=440
+        dd if=${RAUC_IMAGE_NAME} of=${DEVICE_ROOT} conv=notrunc bs=512 seek=1 skip=1
     fi
 fi
 
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index b579379e2..a70e3ce1c 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -277,12 +277,10 @@ function _fix_disk_spl_gpt() {
 function _fix_disk_spl_mbr() {
     local hdd_img="$(hassos_image_name img)"
     local spl_img="$(path_spl_img)"
-    local backup="/tmp/mbr-backup.bin"
 
     # backup MBR
-    dd if=${hdd_img} of=${backup} bs=1 count=72 skip=440
-    dd if=${spl_img} of=${hdd_img} conv=notrunc bs=512
-    dd if=${backup} of=${hdd_img} conv=notrunc bs=1 count=72 seek=440
+    dd if=${spl_img} of=${hdd_img} conv=notrunc bs=1 count=440
+    dd if=${spl_img} of=${hdd_img} conv=notrunc bs=512 seek=1 skip=1
 }