mrrl

commit 71e9ef983eb9702a1788f9cefd3d3d184bece108
parent 21e7369e53f81bf561a51447a3456359fa908e28
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu, 11 Dec 2025 20:43:14 +0000

revert previous commit's changes to sandboox-rootns

Diffstat:
M
commitlist.sha1
 | 
1
-
M
filelist.sha256
 | 
2
+-
M
files/sandbox-rootns.in
 | 
8
--------
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
2
+-
M
variants/ccx-x86_64/sandbox_rootns.environment
 | 
4
++--
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
2
+-
M
variants/root-x86_64/sandbox_rootns.environment
 | 
4
++--

7 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -1773,7 +1773,6 @@ cf90fc56dcb91d473a08582239bfdf941ef1e10b  sources/libelf
 e12821ffb205f41fa8319ad109762a06e121c141  sources/libelf
 fd2af33bd4b64be5221116f85dcf4cd220eb9a1c  sources/libelf
 46238adcde98353a4aaa829066091f79e3437a70  sources/lnstools
-6a07aa99d45f635e2804c4c9f08745fc44a75bc9  sources/lnstools
 409db79b3e7e5fc6b73305471d9bbb6ac5c14036  sources/logincaps
 41039418205b48bda59372fb7c49453852853e8a  sources/logincaps
 790ee186578248e585dec9278f9ce627cc8bf12f  sources/logincaps
diff --git a/filelist.sha256 b/filelist.sha256
@@ -101,7 +101,7 @@ ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417  files/noobjtoo
 c7d3e7ef077d7673567d2f0c34ba2ebd689dab1250286ab482a3064c73ff7d7c  files/s6_clone_newpid.patch.old
 64488d8562a4e98a3b299f095bb2550cff6a3d743dc2b9c5aaeea03e5b83ec33  files/s6_ftrigr_max.patch
 df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c  files/sandbox-rootns-python.in
-2b6a320deae7653a5fa57ebdc925fb25468fb7e05a3af0a96c4585c1521c2497  files/sandbox-rootns.in
+0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e  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
@@ -63,14 +63,6 @@
 	elquote:exit 1
 }
 
-elquote:foreground {
-	fdmove -c 1 2
-	print "%s\n" "[sandbox-rootns] about to pivot. mountinfo:
-}
-elquote:foreground {
-	fdmove -c 1 2
-	cat ${sandbox_pthbs_workdir}/root/proc/self/mountinfo
-}
 elquote:umask 022
 elquote:export UID $pthbs_uid
 elquote:export GID $pthbs_gid
diff --git a/variants/ccx-x86_64/pthbs-sandbox-rootns b/variants/ccx-x86_64/pthbs-sandbox-rootns
@@ -6,7 +6,7 @@
 #+lnstools.ceeca0b11e89564b419da840fe5375a6253522bbf8a34f2db1c3d3b2763f247d
 #+sandbox_rootfs.52fca4403ca801bd19bb7f0e3ebd708e1983288947ff03f7e431baa6b5af125e
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
-#@sha256:2b6a320deae7653a5fa57ebdc925fb25468fb7e05a3af0a96c4585c1521c2497:sandbox-rootns.in
+#@sha256:0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e:sandbox-rootns.in
 
 # - build script start -
 
diff --git a/variants/ccx-x86_64/sandbox_rootns.environment b/variants/ccx-x86_64/sandbox_rootns.environment
@@ -3,4 +3,4 @@
 #+busybox.e054e881b7202c51c9573fb8595b1992f877abaf41be69fbecb4fcf6a990fb1f
 #+execline.edfb251935b54bff3b143907aa04a56552b262e7c4887bb55c79dc1425c63006
 #+sandbox_rootfs.52fca4403ca801bd19bb7f0e3ebd708e1983288947ff03f7e431baa6b5af125e
-#+pthbs-sandbox-rootns.04b22fc0f72a1c16acf2dc63663c57527fb62d1757c41a29315cab66882b62aa-
\ No newline at end of file
+#+pthbs-sandbox-rootns.6a70743aa454ad513e8000e1085e67dfa4c3002b918031a2ee58f73bffa3a7eb+
\ 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.a82511091e714e91f2f43ff982e78599c549a31e1b58f4c644de8937551f0ff3
 #+sandbox_rootfs.bce0239d9e7a513de561fdd5d7809667b84d950b65b30f7701802fd4b10b1006
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
-#@sha256:2b6a320deae7653a5fa57ebdc925fb25468fb7e05a3af0a96c4585c1521c2497:sandbox-rootns.in
+#@sha256:0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e:sandbox-rootns.in
 
 # - build script start -
 
diff --git a/variants/root-x86_64/sandbox_rootns.environment b/variants/root-x86_64/sandbox_rootns.environment
@@ -3,4 +3,4 @@
 #+busybox.95a5f0b11c8542c83e37cdfbee23575e7e71563c72e1bb56f21d65491caf164f
 #+execline.4d503b89c7a92cf6f8cb7de523888d6da6df99d7a37bd36580005304ed801303
 #+sandbox_rootfs.bce0239d9e7a513de561fdd5d7809667b84d950b65b30f7701802fd4b10b1006
-#+pthbs-sandbox-rootns.a3a53f4a5dc12945a697bc8f257c8c40b7e8d38de2b7e6291c6198a9893dc636-
\ No newline at end of file
+#+pthbs-sandbox-rootns.a151947c5514c6c2f80e44bfa5beac1a2f4993e92404131d061aa6db9de37b03+
\ No newline at end of file