From e65bb536976f841cefa4b9774e1d26073e60cdfb Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Fri, 3 Jan 2025 23:03:56 +0100 Subject: [PATCH] tests/check-against-debootstrap-dist: debootstrap 1.0.139 no longers pulls in usr-is-merged --- tests/check-against-debootstrap-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/check-against-debootstrap-dist b/tests/check-against-debootstrap-dist index fedada7..879472b 100644 --- a/tests/check-against-debootstrap-dist +++ b/tests/check-against-debootstrap-dist @@ -12,7 +12,7 @@ echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH" # we cannot use useradd because passwd is not Essential:yes {{ CMD }} --variant={{ VARIANT }} --mode={{ MODE }} \ --essential-hook='[ {{ DIST }} = oldstable ] && [ {{ VARIANT }} = - ] && echo _apt:*:100:65534::/nonexistent:/usr/sbin/nologin >> "$1"/etc/passwd || :' \ - "$(if [ {{ DIST }} = oldstable ]; then echo --merged-usr; else echo --hook-dir=./hooks/merged-usr; fi)" \ + "$(case {{ DIST }} in stable) echo --hook-dir=./hooks/merged-usr ;; *) echo --no-merged-usr ;; esac)" \ "$(case {{ DIST }} in oldstable) echo --include=e2fsprogs,mount,tzdata,gcc-9-base ;; stable) echo --include=e2fsprogs,mount,tzdata ;; *) echo --include=base-files ;; esac)" \ {{ DIST }} /tmp/debian-{{ DIST }}-mm.tar {{ MIRROR }}