From 342366b6293b17f100a387364f4fd977afcf3560 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 9 May 2022 14:32:01 +0200 Subject: Merging upstream version 20220509. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 7 +++++++ VERSION.txt | 2 +- share/build-scripts/debconf.d/0001-preseed-file | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 06288b6..7e1db98 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,10 @@ +2022-05-09 Daniel Baumann + + * Releasing version 20220509. + + [ Daniel Baumann ] + * Correcting wrong preseed-file handling for new links directory in container build script. + 2022-05-08 Daniel Baumann * Releasing version 20220508. diff --git a/VERSION.txt b/VERSION.txt index f5a8b19..6baccb8 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20220508 +20220509 diff --git a/share/build-scripts/debconf.d/0001-preseed-file b/share/build-scripts/debconf.d/0001-preseed-file index 8e90943..aa2c3c7 100755 --- a/share/build-scripts/debconf.d/0001-preseed-file +++ b/share/build-scripts/debconf.d/0001-preseed-file @@ -57,7 +57,7 @@ elif [ -e "${DEBCONF}/links/${NAME}.cfg" ] then # user did not specify a pressed file, but there is a matching one # in /etc/${SOFTWARE}/debconf/links directory - db_set container/preseed-file "${DEBCONF}/${NAME}.cfg" + db_set container/preseed-file "${DEBCONF}/links/${NAME}.cfg" db_fset container/preseed-file seen true elif [ "$(ls ${DEBCONF}/*/${NAME}.cfg 2>/dev/null | wc -l)" -eq 1 ] then -- cgit v1.2.3