From 43262c2c5cccf294fbdf67e434ea77759865d231 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.com>
Date: Thu, 28 Apr 2022 15:14:54 +0100
Subject: [PATCH] make-recovery-images: Attempt to avoid orphaned loopback
 devices

---
 imager/make-recovery-images | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/imager/make-recovery-images b/imager/make-recovery-images
index 731253e..a53c27f 100755
--- a/imager/make-recovery-images
+++ b/imager/make-recovery-images
@@ -47,7 +47,10 @@ EOF
       mount "${LOOP}" fs
       cp -v files/* fs
       sync
+      sleep 5
       umount fs
+      # Delay before calling kpartx otherwise it's sometimes possible to get orphaned loopback devices
+      sleep 5
       kpartx -dv temp.img
    )
    mkdir -p images
@@ -60,3 +63,4 @@ EOF
    rm "images/${img}"
    chown "${SUDO_UID}:${SUDO_GID}" "images/${src}"
 done
+echo "Wrote images for rpi-imager to $(pwd)/images/${src}"