mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-16 22:13:01 +02:00
images: Ensure that all mount points are created
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user