[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/

[Mike Gilbert]

commit:     456fb26fe2564868771b7948b6049dc96743d947
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 23:46:05 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 23:46:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=456fb26f

sys-apps/systemd: backport network fix

Closes: https://bugs.gentoo.org/813102
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/files/249-network-renaming.patch  | 41 ++++++++++++++++++++++
 ...emd-249.4-r3.ebuild => systemd-249.4-r4.ebuild} |  1 +
 2 files changed, 42 insertions(+)

diff --git a/sys-apps/systemd/files/249-network-renaming.patch b/sys-apps/systemd/files/249-network-renaming.patch
new file mode 100644
index 00000000000..b9eecf57b10
--- /dev/null
+++ b/sys-apps/systemd/files/249-network-renaming.patch
@@ -0,0 +1,41 @@
+From 160203e974945ce520fe8f569458634ef898c61c Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@×××××.com>
+Date: Fri, 10 Sep 2021 08:09:56 +0900
+Subject: [PATCH] network: fix handling of network interface renaming
+
+Fixes #20657.
+---
+ src/network/networkd-link.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 4afd540d2015..caad6205ae83 100644
+--- a/src/network/networkd-link.c
++++ b/src/network/networkd-link.c
+@@ -1470,17 +1470,21 @@ static int link_initialized(Link *link, sd_device *device) {
+         assert(link);
+         assert(device);
+ 
+-        if (link->state != LINK_STATE_PENDING)
+-                return 0;
++        /* Always replace with the new sd_device object. As the sysname (and possibly other properties
++         * or sysattrs) may be outdated. */
++        sd_device_ref(device);
++        sd_device_unref(link->sd_device);
++        link->sd_device = device;
+ 
+-        if (link->sd_device)
++        /* Do not ignore unamanaged state case here. If an interface is renamed after being once
++         * configured, and the corresponding .network file has Name= in [Match] section, then the
++         * interface may be already in unmanaged state. See #20657. */
++        if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_UNMANAGED))
+                 return 0;
+ 
+         log_link_debug(link, "udev initialized link");
+         link_set_state(link, LINK_STATE_INITIALIZED);
+ 
+-        link->sd_device = sd_device_ref(device);
+-
+         /* udev has initialized the link, but we don't know if we have yet
+          * processed the NEWLINK messages with the latest state. Do a GETLINK,
+          * when it returns we know that the pending NEWLINKs have already been

diff --git a/sys-apps/systemd/systemd-249.4-r3.ebuild b/sys-apps/systemd/systemd-249.4-r4.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-249.4-r3.ebuild
rename to sys-apps/systemd/systemd-249.4-r4.ebuild
index b651ce70662..dff4c114007 100644
--- a/sys-apps/systemd/systemd-249.4-r3.ebuild
+++ b/sys-apps/systemd/systemd-249.4-r4.ebuild
@@ -229,6 +229,7 @@ src_prepare() {
 		"${FILESDIR}/249-libudev-static.patch"
 		"${FILESDIR}/249-home-secret-assert.patch"
 		"${FILESDIR}/249-fido2.patch"
+		"${FILESDIR}/249-network-renaming.patch"
 	)
 
 	if ! use vanilla; then