images: Ensure that all mount points are created

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-07-09 17:51:37 +00:00
parent d4ad987a5d
commit 20280ed337
3 changed files with 9 additions and 2 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -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