josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

coverage.sh: mount tmpfs as workaround for #1010957

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-05-22 02:51:58 +02:00
parent 454121acb1
commit 6ec09c27ca
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coverage.sh
View file

@ -838,6 +838,7 @@ fi
adduser --gecos user --disabled-password user adduser --gecos user --disabled-password user
sysctl -w kernel.unprivileged_userns_clone=1 sysctl -w kernel.unprivileged_userns_clone=1
export SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH export SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH
mount -o size=4G -t tmpfs tmpfs /tmp # workaround for #1010957
$CMD --mode=root --variant=$variant $DEFAULT_DIST /tmp/debian-chroot-root.$format $mirror $CMD --mode=root --variant=$variant $DEFAULT_DIST /tmp/debian-chroot-root.$format $mirror
if [ "$format" = tar ]; then if [ "$format" = tar ]; then
printf 'ustar ' | cmp --bytes=6 --ignore-initial=257:0 /tmp/debian-chroot-root.tar - printf 'ustar ' | cmp --bytes=6 --ignore-initial=257:0 /tmp/debian-chroot-root.tar -
@ -3061,6 +3062,7 @@ include="--include=doc-debian"
if [ "$variant" = "custom" ]; then if [ "$variant" = "custom" ]; then
include="\$include,base-files,base-passwd,coreutils,dash,diffutils,dpkg,libc-bin,sed" include="\$include,base-files,base-passwd,coreutils,dash,diffutils,dpkg,libc-bin,sed"
fi fi
mount -o size=4G -t tmpfs tmpfs /tmp # workaround for #1010957
$CMD \$include --mode=$defaultmode --variant=$variant \ $CMD \$include --mode=$defaultmode --variant=$variant \
--setup-hook='mkdir -p "\$1"/var/cache/apt/archives/partial' \ --setup-hook='mkdir -p "\$1"/var/cache/apt/archives/partial' \
--setup-hook='touch "\$1"/var/cache/apt/archives/lock' \ --setup-hook='touch "\$1"/var/cache/apt/archives/lock' \

2
run_qemu.sh
View file

@ -34,7 +34,7 @@ ret=0
timeout 20m qemu-system-x86_64 \ timeout 20m qemu-system-x86_64 \
-cpu host \ -cpu host \
-no-user-config \ -no-user-config \
-M accel=kvm:tcg -m 1G -nographic \ -M accel=kvm:tcg -m 4G -nographic \
-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 \ -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 \
-monitor unix:/tmp/monitor,server,nowait \ -monitor unix:/tmp/monitor,server,nowait \
-serial unix:/tmp/ttyS0,server,nowait \ -serial unix:/tmp/ttyS0,server,nowait \