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

tests/check-against-debootstrap-dist: add more restrictions for remaining hacks

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-11-07 16:12:11 +01:00
parent 67902e06e9
commit d15be6abbf
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/check-against-debootstrap-dist
View file

@ -147,6 +147,7 @@ done
# Because of unreproducible uids (#969631) we created the _apt user ourselves # Because of unreproducible uids (#969631) we created the _apt user ourselves
# and because passwd is not Essential:yes we didn't use useradd. But newer # and because passwd is not Essential:yes we didn't use useradd. But newer
# versions of adduser and shadow will create a different /etc/shadow # versions of adduser and shadow will create a different /etc/shadow
if [ "{{ VARIANT }}" = "-" ]; then
case {{ DIST }} in oldstable|stable) case {{ DIST }} in oldstable|stable)
for f in shadow shadow-; do for f in shadow shadow-; do
if grep -q '^_apt:!:' /tmp/debian-{{ DIST }}-debootstrap/etc/$f; then if grep -q '^_apt:!:' /tmp/debian-{{ DIST }}-debootstrap/etc/$f; then
@ -154,6 +155,7 @@ for f in shadow shadow-; do
fi fi
done;; done;;
esac esac
fi
for log in faillog lastlog; do for log in faillog lastlog; do
if ! cmp /tmp/debian-{{ DIST }}-debootstrap/var/log/$log /tmp/debian-{{ DIST }}-mm/var/log/$log >&2;then if ! cmp /tmp/debian-{{ DIST }}-debootstrap/var/log/$log /tmp/debian-{{ DIST }}-mm/var/log/$log >&2;then
@ -181,8 +183,7 @@ if [ "{{ VARIANT }}" = "-" ]; then
fi fi
# workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917773 # workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917773
# also needed for users that are created by systemd-sysusers before systemd 252 case {{ DIST }} in oldstable|stable)
# https://github.com/systemd/systemd/pull/24534
for f in shadow shadow-; do for f in shadow shadow-; do
if [ ! -e /tmp/debian-{{ DIST }}-mm/etc/$f ]; then if [ ! -e /tmp/debian-{{ DIST }}-mm/etc/$f ]; then
continue continue
@ -195,7 +196,8 @@ for f in shadow shadow-; do
else else
echo no difference for /etc/$f on {{ DIST }} {{ VARIANT }} >&2 echo no difference for /etc/$f on {{ DIST }} {{ VARIANT }} >&2
fi fi
done done;;
esac
# check if the file content differs # check if the file content differs
diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2 diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2