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

coverage.sh: setup00-merged-usr.sh moved into a subdirectory

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2021-09-21 23:01:58 +02:00
parent 2bd6929fbc
commit 450881f4ce
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
coverage.sh
View file

@ -103,12 +103,12 @@ if [ ! -e shared/ldconfig.fakechroot ] || [ ldconfig.fakechroot -nt shared/ldcon
cp -a /usr/libexec/mmdebstrap/ldconfig.fakechroot shared/ldconfig.fakechroot cp -a /usr/libexec/mmdebstrap/ldconfig.fakechroot shared/ldconfig.fakechroot
fi fi
fi fi
mkdir -p shared/hooks mkdir -p shared/hooks/merged-usr
if [ ! -e shared/hooks/setup00-merged-usr.sh ] || [ hooks/setup00-merged-usr.sh -nt shared/hooks/setup00-merged-usr.sh ]; then if [ ! -e shared/hooks/merged-usr/setup00.sh ] || [ hooks/merged-usr/setup00.sh -nt shared/hooks/merged-usr/setup00.sh ]; then
if [ -e hooks/setup00-merged-usr.sh ]; then if [ -e hooks/merged-usr/setup00.sh ]; then
cp -a hooks/setup00-merged-usr.sh shared/hooks/ cp -a hooks/merged-usr/setup00.sh shared/hooks/merged-usr/
else else
cp -a /usr/share/mmdebstrap/hooks/setup00-merged-usr.sh shared/hooks/ cp -a /usr/share/mmdebstrap/hooks/merged-usr/setup00.sh shared/hooks/merged-usr/
fi fi
fi fi
mkdir -p shared/hooks/eatmydata mkdir -p shared/hooks/eatmydata
@ -2076,7 +2076,7 @@ cat << END > shared/test.sh
set -eu set -eu
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
$CMD --mode=root --variant=apt \ $CMD --mode=root --variant=apt \
--setup-hook=./hooks/setup00-merged-usr.sh \ --setup-hook=./hooks/merged-usr/setup00.sh \
--customize-hook='[ -L "\$1"/bin -a -L "\$1"/sbin -a -L "\$1"/lib ]' \ --customize-hook='[ -L "\$1"/bin -a -L "\$1"/sbin -a -L "\$1"/lib ]' \
$DEFAULT_DIST /tmp/debian-chroot $mirror $DEFAULT_DIST /tmp/debian-chroot $mirror
tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort > tar2.txt tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort > tar2.txt