From 356026137c08eb8657fb204b6eeceedc80e419a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 11 Nov 2021 01:29:32 -0300 Subject: [PATCH] common/chroot-style: clean up bwrap.sh. --dev-bind isn't necessary in any case it was being used for. We can also use --ro-bind for /void-packages. A possible future improvement would be to mount / read only during the actual build. Also exec bwrap, as done in the uchroot and uunshare chroot styles. And update homepage. --- common/chroot-style/bwrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/chroot-style/bwrap.sh b/common/chroot-style/bwrap.sh index dc1fca461a68..de4323506a3e 100755 --- a/common/chroot-style/bwrap.sh +++ b/common/chroot-style/bwrap.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# This chroot script uses bubblewrap (see https://github.com/projectatomic/bubblewrap) +# This chroot script uses bubblewrap (see https://github.com/containers/bubblewrap) # set -e readonly MASTERDIR="$1" @@ -18,6 +18,6 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then exit 1 fi -bwrap --dev-bind "$MASTERDIR" / --dev-bind "$DISTDIR" /void-packages \ +exec bwrap --bind "$MASTERDIR" / --ro-bind "$DISTDIR" /void-packages \ --dev /dev --tmpfs /tmp --proc /proc \ - ${HOSTDIR:+--dev-bind "$HOSTDIR" /host} $EXTRA_ARGS "$@" + ${HOSTDIR:+--bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"