mrrl

commit 763acb67212d0430f7c76bef8bd05960269c8798
parent 1a5171368510e1a98fcf8e0eb8a150064f169fd3
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Mon,  8 Dec 2025 07:16:41 +0000

Debug failing tar in sandbox-rootns

Diffstat:
M
filelist.sha256
 | 
2
+-
M
files/sandbox-rootns.in
 | 
8
+++++++-
M
templates/pkg/pthbs-sandbox-rootns
 | 
10
++++++++++
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
12
+++++++++++-
M
variants/ccx-x86_64/sandbox_rootns.environment
 | 
4
++--
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
12
+++++++++++-
M
variants/root-x86_64/sandbox_rootns.environment
 | 
4
++--

7 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -98,7 +98,7 @@ ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417  files/noobjtoo
 c7d3e7ef077d7673567d2f0c34ba2ebd689dab1250286ab482a3064c73ff7d7c  files/s6_clone_newpid.patch.old
 64488d8562a4e98a3b299f095bb2550cff6a3d743dc2b9c5aaeea03e5b83ec33  files/s6_ftrigr_max.patch
 df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c  files/sandbox-rootns-python.in
-988c4d90c88e2af7c8c70f8084e4f0dd8e50ad9143ad46f4be50715b2dda9460  files/sandbox-rootns.in
+0dfa0b3e1ac4c263a0ce11be4d53979a2e10be3b404094f9aada3c041c0184b3  files/sandbox-rootns.in
 37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4  files/strace-6.5-static.patch
 07c3c30dab68c905d5608124e729592a30b2c087f24e7b76940f5321786128b1  files/update-links
 664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df  files/user-env
diff --git a/files/sandbox-rootns.in b/files/sandbox-rootns.in
@@ -53,8 +53,14 @@
 	elquote:mount -o rw,rbind ${sandbox_workdir} .${sandbox_workdir}
 }
 
-elquote:if {
+elquote:ifelse -n {
 	elquote:tar xpf elquote:root.tar
+} {
+	elquote:foreground {
+		elquote:find -exec
+		elquote:ls -ld "{}" +
+	}
+	elquote:exit 1
 }
 
 elquote:umask 022
diff --git a/templates/pkg/pthbs-sandbox-rootns b/templates/pkg/pthbs-sandbox-rootns
@@ -15,6 +15,8 @@
 exe_name=sandbox-rootns
 
 # busybox
+prog_find=$(which find)
+prog_ls=$(which ls)
 prog_mkdir=$(which mkdir)
 prog_mount=$(which mount)
 prog_tar=$(which tar)
@@ -23,8 +25,11 @@ prog_unshare=$(which unshare)
 # execline
 prog_cd=$(which cd)
 prog_execlineb=$(which execlineb)
+prog_exit=$(which exit)
 prog_export=$(which export)
+prog_foreground=$(which foreground)
 prog_if=$(which if)
+prog_ifelse=$(which ifelse)
 prog_importas=$(which importas)
 prog_multisubstitute=$(which multisubstitute)
 prog_umask=$(which umask)
@@ -40,14 +45,19 @@ rootfs="$pthbs_build_environment/pthbs/sandbox/root.tar"
 
 awk -f ./abspaths.awk ./${exe_name}.in >./${exe_name} \
 	root.tar="$rootfs" \
+	find="$prog_find" \
+	ls="$prog_ls" \
 	mkdir="$prog_mkdir" \
 	mount="$prog_mount" \
 	tar="$prog_tar" \
 	unshare="$prog_unshare" \
 	cd="$prog_cd" \
 	execlineb="$prog_execlineb" \
+	exit="$prog_exit" \
 	export="$prog_export" \
 	if="$prog_if" \
+	ifelse="$prog_ifelse" \
+	foreground="$prog_foreground" \
 	importas="$prog_importas" \
 	multisubstitute="$prog_multisubstitute" \
 	umask="$prog_umask" \
diff --git a/variants/ccx-x86_64/pthbs-sandbox-rootns b/variants/ccx-x86_64/pthbs-sandbox-rootns
@@ -6,7 +6,7 @@
 #+lnstools.e19f5f7ba4bae384a8acd87690ae30ecca4b7fc563e9794d82c2ffb805797d7d
 #+sandbox_rootfs.c0bb1b67393bb1c9ad4d66cd210409db15205c02b56626c3872365c0f37d88ad
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
-#@sha256:988c4d90c88e2af7c8c70f8084e4f0dd8e50ad9143ad46f4be50715b2dda9460:sandbox-rootns.in
+#@sha256:0dfa0b3e1ac4c263a0ce11be4d53979a2e10be3b404094f9aada3c041c0184b3:sandbox-rootns.in
 
 # - build script start -
 
@@ -18,6 +18,8 @@ cd '.'
 exe_name=sandbox-rootns
 
 # busybox
+prog_find=$(which find)
+prog_ls=$(which ls)
 prog_mkdir=$(which mkdir)
 prog_mount=$(which mount)
 prog_tar=$(which tar)
@@ -26,8 +28,11 @@ prog_unshare=$(which unshare)
 # execline
 prog_cd=$(which cd)
 prog_execlineb=$(which execlineb)
+prog_exit=$(which exit)
 prog_export=$(which export)
+prog_foreground=$(which foreground)
 prog_if=$(which if)
+prog_ifelse=$(which ifelse)
 prog_importas=$(which importas)
 prog_multisubstitute=$(which multisubstitute)
 prog_umask=$(which umask)
@@ -43,14 +48,19 @@ rootfs="$pthbs_build_environment/pthbs/sandbox/root.tar"
 
 awk -f ./abspaths.awk ./${exe_name}.in >./${exe_name} \
 	root.tar="$rootfs" \
+	find="$prog_find" \
+	ls="$prog_ls" \
 	mkdir="$prog_mkdir" \
 	mount="$prog_mount" \
 	tar="$prog_tar" \
 	unshare="$prog_unshare" \
 	cd="$prog_cd" \
 	execlineb="$prog_execlineb" \
+	exit="$prog_exit" \
 	export="$prog_export" \
 	if="$prog_if" \
+	ifelse="$prog_ifelse" \
+	foreground="$prog_foreground" \
 	importas="$prog_importas" \
 	multisubstitute="$prog_multisubstitute" \
 	umask="$prog_umask" \
diff --git a/variants/ccx-x86_64/sandbox_rootns.environment b/variants/ccx-x86_64/sandbox_rootns.environment
@@ -3,4 +3,4 @@
 #+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
 #+execline.97dcd338d1cd526ffe28a8cbb05849056cb77d98f2ba70113cf1197c070caf98
 #+sandbox_rootfs.c0bb1b67393bb1c9ad4d66cd210409db15205c02b56626c3872365c0f37d88ad
-#+pthbs-sandbox-rootns.df070c7cc75acd65d456d7048ec73397cc2c6860ebe17483d72bacd9c3c95dee-
\ No newline at end of file
+#+pthbs-sandbox-rootns.fb33fb6eec20480746dab38fbd1841360497b2ba67f1aef5ffa0d5c1acae0a8d+
\ No newline at end of file
diff --git a/variants/root-x86_64/pthbs-sandbox-rootns b/variants/root-x86_64/pthbs-sandbox-rootns
@@ -6,7 +6,7 @@
 #+lnstools.4cd9dc1e63902226eb24b30e6285408ea3a8fa37c5fefd0251f013c6686109ea
 #+sandbox_rootfs.da56a3e9eb268605ab40d9a659cef6ae8381c4e1bb32fff6e71db1057cf0544a
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
-#@sha256:988c4d90c88e2af7c8c70f8084e4f0dd8e50ad9143ad46f4be50715b2dda9460:sandbox-rootns.in
+#@sha256:0dfa0b3e1ac4c263a0ce11be4d53979a2e10be3b404094f9aada3c041c0184b3:sandbox-rootns.in
 
 # - build script start -
 
@@ -18,6 +18,8 @@ cd '.'
 exe_name=sandbox-rootns
 
 # busybox
+prog_find=$(which find)
+prog_ls=$(which ls)
 prog_mkdir=$(which mkdir)
 prog_mount=$(which mount)
 prog_tar=$(which tar)
@@ -26,8 +28,11 @@ prog_unshare=$(which unshare)
 # execline
 prog_cd=$(which cd)
 prog_execlineb=$(which execlineb)
+prog_exit=$(which exit)
 prog_export=$(which export)
+prog_foreground=$(which foreground)
 prog_if=$(which if)
+prog_ifelse=$(which ifelse)
 prog_importas=$(which importas)
 prog_multisubstitute=$(which multisubstitute)
 prog_umask=$(which umask)
@@ -43,14 +48,19 @@ rootfs="$pthbs_build_environment/pthbs/sandbox/root.tar"
 
 awk -f ./abspaths.awk ./${exe_name}.in >./${exe_name} \
 	root.tar="$rootfs" \
+	find="$prog_find" \
+	ls="$prog_ls" \
 	mkdir="$prog_mkdir" \
 	mount="$prog_mount" \
 	tar="$prog_tar" \
 	unshare="$prog_unshare" \
 	cd="$prog_cd" \
 	execlineb="$prog_execlineb" \
+	exit="$prog_exit" \
 	export="$prog_export" \
 	if="$prog_if" \
+	ifelse="$prog_ifelse" \
+	foreground="$prog_foreground" \
 	importas="$prog_importas" \
 	multisubstitute="$prog_multisubstitute" \
 	umask="$prog_umask" \
diff --git a/variants/root-x86_64/sandbox_rootns.environment b/variants/root-x86_64/sandbox_rootns.environment
@@ -3,4 +3,4 @@
 #+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
 #+execline.0eb0935639ed55b8948221824f1af13a1df21af537b12b7405e3bcf9441be47a
 #+sandbox_rootfs.da56a3e9eb268605ab40d9a659cef6ae8381c4e1bb32fff6e71db1057cf0544a
-#+pthbs-sandbox-rootns.5256c1693ba3f03852ea1eaad36afbb5f20c06f4781b41cfed0ca2e23054cf7c-
\ No newline at end of file
+#+pthbs-sandbox-rootns.11d8cfce6335508dfc44849710a0a88ffbbd21e8094270d94703551b82e61316+
\ No newline at end of file