From 5d0401a528fdbae4a48287c9e61d11fd782652f0 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Sat, 19 May 2018 21:26:24 +0200
Subject: [PATCH] Update hdd-image.sh (#21)

* Update hdd-image.sh

* Update post-image.sh

* Update post-image.sh
---
 buildroot-external/board/ova/post-image.sh  |  2 +-
 buildroot-external/board/rpi3/post-image.sh |  4 +++-
 buildroot-external/scripts/hdd-image.sh     | 11 ++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/buildroot-external/board/ova/post-image.sh b/buildroot-external/board/ova/post-image.sh
index 36aee53a8..448f3711e 100755
--- a/buildroot-external/board/ova/post-image.sh
+++ b/buildroot-external/board/ova/post-image.sh
@@ -24,6 +24,6 @@ cp ${BOARD_DIR}/barebox-state.dtb ${BOOT_DATA}/EFI/barebox/state.dtb
 create_boot_image ${BINARIES_DIR}
 create_overlay_image ${BINARIES_DIR}
 
-create_hdd_image ${BINARIES_DIR} ${BINARIES_DIR}/harddisk.img 6
+create_disk_image ${BINARIES_DIR} ${BINARIES_DIR}/harddisk.img 6
 
 qemu-img convert -O vmdk ${BINARIES_DIR}/harddisk.img ${BINARIES_DIR}/${IMAGE_FILE}
diff --git a/buildroot-external/board/rpi3/post-image.sh b/buildroot-external/board/rpi3/post-image.sh
index 429a688bf..c39c27765 100755
--- a/buildroot-external/board/rpi3/post-image.sh
+++ b/buildroot-external/board/rpi3/post-image.sh
@@ -28,5 +28,7 @@ cp -r rpi-firmware/overlays ${BOOT_DATA}/
 create_boot_image ${BINARIES_DIR}
 create_overlay_image ${BINARIES_DIR}
 
-create_hdd_image ${BINARIES_DIR} ${BINARIES_DIR}/${IMAGE_FILE} 6
+create_disk_image ${BINARIES_DIR} ${BINARIES_DIR}/${IMAGE_FILE} 6
+fix_disk_image_mbr ${BINARIES_DIR}/${IMAGE_FILE}
+
 bzip2 ${BINARIES_DIR}/${IMAGE_FILE}
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index c9b25a610..90b220c3e 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -13,6 +13,7 @@ SYSTEM_SIZE=256M
 OVERLAY_SIZE=64M
 DATA_SIZE=1G
 
+
 function create_boot_image() {
     local boot_data="${1}/boot"
     local boot_img="${1}/boot.vfat"
@@ -23,6 +24,7 @@ function create_boot_image() {
     mcopy -i ${boot_img} -sv ${boot_data}/* ::
 }
 
+
 function create_overlay_image() {
     local overlay_img="${1}/overlay.ext4"
 
@@ -30,7 +32,8 @@ function create_overlay_image() {
     mkfs.ext4 -L "hassos-overlay" -E lazy_itable_init=0,lazy_journal_init=0 ${overlay_img}
 }
 
-function create_hdd_image() {
+
+function create_disk_image() {
     local boot_img="${1}/boot.vfat"
     local rootfs_img="${1}/rootfs.squashfs"
     local overlay_img="${1}/overlay.ext4"
@@ -68,3 +71,9 @@ function create_hdd_image() {
     dd if=${data_img} of=${hdd_img} conv=notrunc bs=512 obs=512 seek=${data_offset}
 }
 
+
+function fix_disk_image_mbr() {
+    local hdd_img=${2}
+
+    #sgdisk -h 1 ${hdd_img}
+}