From 2bc95cc69770d74b26539b585c0472fe7a5b7c03 Mon Sep 17 00:00:00 2001
From: Holger Pandel <holger.pandel@googlemail.com>
Date: Wed, 4 Dec 2019 16:33:29 +0100
Subject: [PATCH] More syncs

---
 scripts/qcow2_handling | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/qcow2_handling b/scripts/qcow2_handling
index 1d0058f..7057dd4 100644
--- a/scripts/qcow2_handling
+++ b/scripts/qcow2_handling
@@ -35,7 +35,9 @@ export -f init_nbd
 connect_blkdev() {
     init_nbd
     qemu-nbd --discard=unmap -c $NBD_DEV "$1"
+    sync
     kpartx -a $NBD_DEV
+    sync
     CURRENT_IMAGE="$1"
 }
 export -f connect_blkdev
@@ -180,6 +182,7 @@ function make_bootable_image() {
     echo "Resize fs and partition"
     CALL_FROM_MBI=1
     resize_qcow2
+    sync
     CALL_FROM_MBI=
 
     echo "Disconnect block device"
@@ -192,9 +195,11 @@ function make_bootable_image() {
 
     echo "Shrinking qcow2 image"
     qemu-img resize --shrink "${EXPORT_QCOW2}" $NEW_IMG_SIZE
+    sync
 
     echo "Convert qcow2 to raw image"
     qemu-img convert -f qcow2 -O raw "${EXPORT_QCOW2}" "${EXPORT_IMAGE}"
+    sync
 
     echo "Get PARTUUIDs from image"
     IMGID="$(blkid -o value -s PTUUID "${EXPORT_IMAGE}")"
@@ -230,6 +235,7 @@ function make_bootable_image() {
     fi
 
     echo "Umount image"
+    sync
     umount "${MOUNTROOT}/boot" || exit 1
     umount "${MOUNTROOT}" || exit 1