From 5efdef53405b037d3492c3839589b0f2eebcc3e8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 15 Oct 2022 17:22:00 +0200 Subject: Merging upstream version 20221015. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 21 ++++++++++++++++++--- VERSION.txt | 2 +- share/build-scripts/debconf | 3 +++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e789f68..94e6755 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,14 @@ +2022-10-15 Daniel Baumann + + * Releasing version 20221015. + + [ Daniel Baumann ] + * Removing machine-id from cache to fix re-using it amongst all generated containers, thanks to Sakirnth Nagarasa . + * Correcting a few formating errors in changelog. + 2022-10-02 Daniel Baumann - * Releasing version 20220721. + * Releasing version 20221002. [ Daniel Baumann ] * Adding force and interactive options to container restart command. @@ -265,7 +273,7 @@ 2021-06-29 Daniel Baumann - * Releasing version 20210628. + * Releasing version 20210629. * Backward incompatible changes: - The networking integration on the container host depended on @@ -843,6 +851,7 @@ 2016-12-10 Daniel Baumann * Releasing version 20161210. + * Backward incompatible changes: - container list shows now only the first IPv4 address. - container rename command has been renamed to move. @@ -890,7 +899,7 @@ 2016-11-25 Daniel Baumann - * Releasing version 20161122. + * Releasing version 20161125. [ Daniel Baumann ] * Renaming too generic internal getopt variables to avoid possible @@ -901,6 +910,7 @@ 2016-11-22 Daniel Baumann * Releasing version 20161122. + * Backward incompatible changes: - renaming curl cache directory from /var/cache/container-tools/curl to /var/cache/container-tools/images. @@ -922,6 +932,7 @@ 2016-11-12 Daniel Baumann * Releasing version 20161112. + * Backward incompatible changes: - removes support to create Debian 8 (jessie) container in debconf container create script. @@ -945,6 +956,7 @@ 2016-11-05 Daniel Baumann * Releasing version 20161105. + * Backward incompatible changes: - container use systemd-networkd instead of ifupdown. @@ -1133,6 +1145,7 @@ 2016-06-01 Daniel Baumann * Releasing version 20160601. + * Backward incompatible changes: - for consistency reasons, instead of any file only files with .cfg suffix are accepted as preseed files in @@ -1157,6 +1170,7 @@ 2016-05-15 Daniel Baumann * Releasing version 20160515. + * Backward incompatible changes: - container network configuration in the [start] section for multi-interface support: @@ -1222,6 +1236,7 @@ 2016-04-15 Daniel Baumann * Releasing version 20160415. + * Backward incompatible changes: - container stop command option -k|--kill renamed to -f|--force for consistency diff --git a/VERSION.txt b/VERSION.txt index 9bab13a..88e8f3f 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20221002 +20221015 diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf index b589fce..36482a3 100755 --- a/share/build-scripts/debconf +++ b/share/build-scripts/debconf @@ -471,6 +471,9 @@ EOF rm -f "${DIRECTORY}/etc/mtab" ln -s /proc/self/mounts "${DIRECTORY}/etc/mtab" + # Removing machine-id + rm -f "${DIRECTORY}/etc/machine-id" + # Removing resolv.conf rm -f "${DIRECTORY}/etc/resolv.conf" cp /etc/resolv.conf "${DIRECTORY}/etc" -- cgit v1.2.3