From 20280ed337b2b9f28f6f33f993655a444aa06a64 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Jul 2024 17:51:37 +0000
Subject: [PATCH] images: Ensure that all mount points are created

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/Config       | 3 +++
 lfs/cdrom        | 3 ++-
 lfs/flash-images | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lfs/Config b/lfs/Config
index 6914298a1b..baf2bdbc03 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -382,6 +382,9 @@ __COMPRESS = \
 COMPRESS_XZ   = $(call __COMPRESS,$(1),$(2),xz $(XZ_OPT))
 COMPRESS_ZSTD = $(call __COMPRESS,$(1),$(2),zstd $(ZSTD_OPT))
 
+# Helper function to make sure that we have all sorts of mountpoints in the images
+CREATE_MOUNTPOINTS = mkdir -pv $(1)/dev $(1)/proc $(1)/sys
+
 define PAK
 	# Bringing the files to their right place.
 	@rm -rf $(DIR_TMP_PAK) && mkdir -p $(DIR_TMP_PAK)
diff --git a/lfs/cdrom b/lfs/cdrom
index 33dc31400b..3681b05880 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -150,7 +150,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Copy all files that we want
 	$(call COPY_FILES,$(DIR_SRC)/config/rootfiles/common,$(DIR_TMP)/root)
 
-	mkdir $(DIR_TMP)/root/sys
+	# Create mountpoints
+	$(call CREATE_MOUNTPOINTS,$(DIR_TMP)/root)
 
 	# Create the archive
 	$(call COMPRESS_ZSTD,$(DIR_TMP)/root,$(DIR_TMP)/cdrom/distro.img)
diff --git a/lfs/flash-images b/lfs/flash-images
index 18745c6a83..367dc149af 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -142,8 +142,11 @@ endif
 	# Copy all files
 	$(call COPY_FILES,$(DIR_SRC)/config/rootfiles/common,$(MNThdd))
 
+	# Create mount points
+	$(call CREATE_MOUNTPOINTS,$(MNThdd))
+
 	-touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
-	mkdir $(MNThdd)/proc
+
 	mount --bind /proc $(MNThdd)/proc
 	mount --bind /dev  $(MNThdd)/dev
 	mount --bind /sys  $(MNThdd)/sys
-- 
2.39.5