[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b95199a3824170778acafbc4de86a9dccde807d2

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b95199a3824170778acafbc4de86a9dccde807d2

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3051 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, master has been updated
       via  b95199a3824170778acafbc4de86a9dccde807d2 (commit)
       via  1c1838509c0180c331cd267a8e728497939f60ee (commit)
      from  3d971965256c3bd9d6c233675b6b20fc5e51f810 (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 b95199a3824170778acafbc4de86a9dccde807d2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 28 15:41:55 2024 +0000

    make.sh: Don't try to create a time NS on older kernels
    
    This is not supported on kernels < 5.6.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 1c1838509c0180c331cd267a8e728497939f60ee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 28 15:28:42 2024 +0000

    make.sh: Bind-mount /proc as a workaround for unshare
    
    unshare seems to want to change the mount propagation for /proc
    before it has been mounted. In order to workaround that problem,
    we bind-mount /proc to itself before.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 make.sh | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/make.sh b/make.sh
index f474ee7ae..3442709b0 100755
--- a/make.sh
+++ b/make.sh
@@ -54,9 +54,19 @@ ARCHES=(
 )
 
 HOST_ARCH="${HOSTTYPE}"
+HOST_KERNEL="$(uname -r)"
 LC_ALL=POSIX
 PS1='\u:\w$ '
 
+HAS_TIME_NAMESPACE="true"
+
+# Disable time namespaces for older kernels
+case "${HOST_KERNEL}" in
+	4.*|5.[12345].*)
+		HAS_TIME_NAMESPACE="false"
+		;;
+esac
+
 # Are we reading from/writing to a terminal?
 is_terminal() {
 	[ -t 0 ] && [ -t 1 ] && [ -t 2 ]
@@ -461,6 +471,10 @@ prepareenv() {
 	mount build_tmp "${BUILD_DIR}/tmp" \
 		-t tmpfs -o "nosuid,nodev,strictatime,size=4G,nr_inodes=1M,mode=1777"
 
+	# Create an empty /proc directory and make it a mountpoint
+	mkdir -p "${BUILD_DIR}/proc"
+	mount --bind "${BUILD_DIR}/proc" "${BUILD_DIR}/proc"
+
 	# Make all sources and proc available under lfs build
 	mount --bind     	/sys					"${BUILD_DIR}/sys"
 	mount --bind -o ro	"${BASEDIR}/cache"		"${BUILD_DIR}/usr/src/cache"
@@ -670,9 +684,6 @@ execute() {
 			"--pid"
 			"--fork"
 
-			# Create a new time namespace
-			"--time"
-
 			# Create a new UTS namespace
 			"--uts"
 
@@ -683,6 +694,11 @@ execute() {
 			# If unshare is asked to terminate, terminate all child processes
 			"--kill-child"
 		)
+
+		# Optionally set up a new time namespace
+		if [ "${HAS_TIME_NAMESPACE}" = "true" ]; then
+			unshare+=( "--time" )
+		fi
 	fi
 
 	while [ $# -gt 0 ]; do


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