From d15be6abbf287ddb6d2fd96128e395dcb2d5d4d8 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Mon, 7 Nov 2022 16:12:11 +0100 Subject: [PATCH] tests/check-against-debootstrap-dist: add more restrictions for remaining hacks --- tests/check-against-debootstrap-dist | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/check-against-debootstrap-dist b/tests/check-against-debootstrap-dist index c256060..97766ac 100644 --- a/tests/check-against-debootstrap-dist +++ b/tests/check-against-debootstrap-dist @@ -147,6 +147,7 @@ done # 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 # versions of adduser and shadow will create a different /etc/shadow +if [ "{{ VARIANT }}" = "-" ]; then case {{ DIST }} in oldstable|stable) for f in shadow shadow-; do if grep -q '^_apt:!:' /tmp/debian-{{ DIST }}-debootstrap/etc/$f; then @@ -154,6 +155,7 @@ for f in shadow shadow-; do fi done;; esac +fi for log in faillog lastlog; do 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 # 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 -# https://github.com/systemd/systemd/pull/24534 +case {{ DIST }} in oldstable|stable) for f in shadow shadow-; do if [ ! -e /tmp/debian-{{ DIST }}-mm/etc/$f ]; then continue @@ -195,7 +196,8 @@ for f in shadow shadow-; do else echo no difference for /etc/$f on {{ DIST }} {{ VARIANT }} >&2 fi -done +done;; +esac # check if the file content differs diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2