From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 24 Oct 2024 06:18:07 +0000 (+0200)
Subject: flash-images: move sleep 1 to a better place
X-Git-Tag: v2.29-core190~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e91ae5e75a18d9c1a260104cfa0423a1de8a822a;p=ipfire-2.x.git

flash-images: move sleep 1 to a better place

kpartx trigger the automount feature of some desktop environments
which result in a mounted filesystem if it was created to fast after
kpartx.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/flash-images b/lfs/flash-images
index 695eb4b6b5..2f3010fc4d 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -112,6 +112,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	kpartx -v -a $(DEVICE)
 
+	# kpartx trigger a automount on some desktop enviroments
+	# this leads in failing zerofree after build and umount the image
+	# with the sleep 1 prevent this because the image has no fs yet.
+	sleep 1
+
 	# Format them
 ifeq "$(PART_TYPE)" "c"
 	mkfs.vfat $(PART_BOOT)
@@ -225,9 +230,6 @@ endif
 	umount $(MNThdd)/boot
 	umount $(MNThdd)
 
-	# sometime zerofree will fail without this
-	sleep 1
-
 	# zerofree the ext4 images to get better compression
 ifneq "$(PART_TYPE)" "c"
 	zerofree $(PART_BOOT)