[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ad12edfb0d233498410f2afc09753e70de50f80

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ad12edfb0d233498410f2afc09753e70de50f80

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2568 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  7ad12edfb0d233498410f2afc09753e70de50f80 (commit)
      from  07f6a51a20cacad8cbfa933ab2af4365cdd30505 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7ad12edfb0d233498410f2afc09753e70de50f80
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Sep 11 09:31:43 2024 +0000

    make.sh: Bind-mount all loop devices
    
    There seems to be a different way how to create loop devices. On my
    Debian system, the first loop device is a block device with major=7 and
    minor=0, the second device is major=7 and minor=1, and so on.
    
    On a system running Grml, the second loop device has major=7 and
    minor=32, and all following ones are increasing their minor by 32
    as well instead of one.
    
    Since I don't have an easy way to detect this, we will simply bind-mount
    all available loop devices in to the build environment.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 make.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/make.sh b/make.sh
index 21543c667..e8c3b0827 100755
--- a/make.sh
+++ b/make.sh
@@ -447,14 +447,19 @@ prepareenv() {
 
 	# Create loop devices
 	mknod -m 666 "${BUILD_DIR}/dev/loop-control"	c  10 237
-	mknod -m 666 "${BUILD_DIR}/dev/loop0"			b   7   0
-	mknod -m 666 "${BUILD_DIR}/dev/loop1"			b   7   1
-	mknod -m 666 "${BUILD_DIR}/dev/loop2"			b   7   2
-	mknod -m 666 "${BUILD_DIR}/dev/loop3"			b   7   3
-	mknod -m 666 "${BUILD_DIR}/dev/loop4"			b   7   4
-	mknod -m 666 "${BUILD_DIR}/dev/loop5"			b   7   5
-	mknod -m 666 "${BUILD_DIR}/dev/loop6"			b   7   6
-	mknod -m 666 "${BUILD_DIR}/dev/loop7"			b   7   7
+
+	local loop
+
+	# Copy all loop devices from the host
+	for loop in /dev/loop*; do
+		if [ -b "${loop}" ]; then
+			# Create the mountpoint
+			: > "${BUILD_DIR}${loop}"
+
+			# Bind-mount the device
+			mount --bind  "${loop}" "${BUILD_DIR}${loop}"
+		fi
+	done
 
 	# Create directories
 	mkdir -p "${BUILD_DIR}/dev/pts"


hooks/post-receive
--
IPFire 2.x development tree