From b648db0afd93e1e40c79db6367fae06d5726e113 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Thu, 9 Feb 2023 11:07:57 +0100 Subject: [PATCH] tests: tzdata dropped /etc/timezone --- tests/essential-hook | 2 +- tests/multiple-include | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/essential-hook b/tests/essential-hook index 2e2a561..dc2b01f 100644 --- a/tests/essential-hook +++ b/tests/essential-hook @@ -8,7 +8,7 @@ echo tzdata tzdata/Zones/Europe select Berlin | chroot "$1" debconf-set-selectio SCRIPT chmod +x /tmp/essential.sh {{ CMD }} --mode=root --variant=apt --include=tzdata --essential-hook='echo tzdata tzdata/Areas select Europe | chroot "$1" debconf-set-selections' --essential-hook=/tmp/essential.sh {{ DIST }} /tmp/debian-chroot {{ MIRROR }} -echo Europe/Berlin | cmp /tmp/debian-chroot/etc/timezone +[ "$(readlink /tmp/debian-chroot/etc/localtime)" = "/usr/share/zoneinfo/Europe/Berlin" ] tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort \ | grep -v '^./etc/localtime' \ | grep -v '^./etc/timezone' \ diff --git a/tests/multiple-include b/tests/multiple-include index a99d0d4..c6dbaea 100644 --- a/tests/multiple-include +++ b/tests/multiple-include @@ -8,7 +8,6 @@ rm -r /tmp/debian-chroot/usr/share/doc/debian rm -r /tmp/debian-chroot/usr/share/doc/doc-debian rm /tmp/debian-chroot/usr/share/lintian/overrides/tzdata rm /tmp/debian-chroot/etc/localtime -rm /tmp/debian-chroot/etc/timezone rm -r /tmp/debian-chroot/usr/share/doc/tzdata rm -r /tmp/debian-chroot/usr/share/zoneinfo rm /tmp/debian-chroot/var/lib/apt/extended_states