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.
This commit is contained in:
parent
b819e84139
commit
6c7c41b120
1 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/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
|
set -e
|
||||||
readonly MASTERDIR="$1"
|
readonly MASTERDIR="$1"
|
||||||
|
@ -18,6 +18,6 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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 \
|
--dev /dev --tmpfs /tmp --proc /proc \
|
||||||
${HOSTDIR:+--dev-bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"
|
${HOSTDIR:+--bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"
|
||||||
|
|
Loading…
Reference in a new issue