From bceaa35b5113fc129ff3a35e822befea3c042f1d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 22 May 2022 15:26:22 +0200 Subject: Merging upstream version 20220522. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 7 +++++++ VERSION.txt | 2 +- libexec/container/start | 7 ------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7e1db98..ca36983 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,10 @@ +2022-05-22 Daniel Baumann + + * Releasing version 20220522. + + [ Daniel Baumann ] + * Fixing copy&paste mistake in systemd-network run-files handling. + 2022-05-09 Daniel Baumann * Releasing version 20220509. diff --git a/VERSION.txt b/VERSION.txt index 6baccb8..99ebccd 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20220509 +20220522 diff --git a/libexec/container/start b/libexec/container/start index de6bd84..7b95866 100755 --- a/libexec/container/start +++ b/libexec/container/start @@ -420,13 +420,6 @@ Name=${INTERFACE} [Network] Bridge=${BRIDGE} -cat > "/etc/network/interfaces.d/${INTERFACE}" << EOF -allow-hotplug ${INTERFACE} -iface ${INTERFACE} inet manual - pre-up ip link set ${INTERFACE} up - post-up ip link set ${INTERFACE} master ${BRIDGE} - pre-down ip link set ${INTERFACE} nomaster - post-down ip link set ${INTERFACE} down EOF networkctl reload -- cgit v1.2.3