From af51df753076aeb609154d6ada91d0b577b7ee6a Mon Sep 17 00:00:00 2001 From: Dawid Sobczak Date: Sun, 20 Apr 2025 09:25:22 +0100 Subject: [PATCH] remove unshare --- 06/build.sh | 3 ++- 06/helpers/chroot | 3 ++- 06/helpers/maint/build-custom-stage5 | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/06/build.sh b/06/build.sh index 5f896b7..0be3730 100755 --- a/06/build.sh +++ b/06/build.sh @@ -41,7 +41,8 @@ fi MKDIR=$(command -v mkdir) CHROOT=$(command -v chroot) -exec env -i "NPROC=$NPROC" unshare -nrm bash -uexs < stage/dev/null $MOUNT --bind /dev/null stage/dev/null diff --git a/06/helpers/chroot b/06/helpers/chroot index b8cdd65..55474a4 100755 --- a/06/helpers/chroot +++ b/06/helpers/chroot @@ -15,4 +15,5 @@ set -uex -exec unshare -nrm helpers/chroot-inner "$@" +# exec unshare -nrm helpers/chroot-inner "$@" +exec helpers/chroot-inner "$@" diff --git a/06/helpers/maint/build-custom-stage5 b/06/helpers/maint/build-custom-stage5 index 470b955..5cbc00a 100755 --- a/06/helpers/maint/build-custom-stage5 +++ b/06/helpers/maint/build-custom-stage5 @@ -36,7 +36,7 @@ rm -f "$DESTDIR/store/5-go-beyond-using-nix/ZilchOS-core.iso" # Inject ccache data, all stage5 ccache data we can find if [[ "${USE_CCACHE-}" = 1 ]]; then helpers/inject "$DESTDIR" pkgs/_2a0-ccache.pkg - unshare -nr chroot "$DESTDIR" /store/_2a0-ccache/bin/ccache -z + # unshare -nr chroot "$DESTDIR" /store/_2a0-ccache/bin/ccache -z if [[ -e tmp/ccache/5-go-beyond-using-nix.tar.zstd ]]; then tar -Izstd -xf tmp/ccache/5-go-beyond-using-nix.tar.zstd \ -C "$DESTDIR/ccache" @@ -74,7 +74,7 @@ tar -Izstd -cf "pkgs/custom-stage5.pkg" \ # Collect ccache back if [[ "${USE_CCACHE-}" = 1 ]]; then - unshare -nr chroot "$DESTDIR" /store/_2a0-ccache/bin/ccache -sz + # unshare -nr chroot "$DESTDIR" /store/_2a0-ccache/bin/ccache -sz tar -Izstd -cf "tmp/ccache/custom-stage5.tar.zstd" \ -C "$DESTDIR/ccache" . fi