rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add support to bond port prio property

Browse Source 
In addition: team: don't try to connect to teamd in update_connection()

Resolves: #1920398 #2182029
This commit is contained in:
Fernando Fernandez Mancera 2023-05-15 16:43:27 +02:00 committed by Fernando Fernandez Mancera
parent 126ae109e9
commit bf3c53e8cf
3 changed files with 1590 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1531
1003-suppport-bond-port-prio-rh1920398.patch Normal file
View File

File diff suppressed because it is too large Load Diff

52
1004-team-don-t-try-to-connect-to-teamd-in-update_connect-rh2182029.patch Normal file
View File

@ -0,0 +1,52 @@
From 4a9d5b23ab513f0ee0b8f490e522f60d4ef3e4cd Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 4 May 2023 15:11:49 +0200
Subject: [PATCH] team: don't try to connect to teamd in update_connection()
In constructed(), NMDevice starts watching the D-Bus name owner or
monitoring the unix socket, and so it is always aware if teamd is
running. When it is, NMDevice connects to it and initializes
priv->tdc.
It is not useful to try to connect to teamd in update_connection()
because warnings will be generated by NM and by libteam if teamd is
not running. As explained above the connection is always initialized
when teamd is available, and so we can just check priv->tdc.
Fixes: ab586236e36b ('core: implement update_connection() for Team')
https://bugzilla.redhat.com/show_bug.cgi?id=2182029
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1631
(cherry picked from commit 93430627c245a0b33b873edca329fa716ccfb7d6)
(cherry picked from commit b60f0dd0a20db232c7edc01faa4562ce510ed107)
(cherry picked from commit f6f1a44559990765a5cbc940a74f54df5d8a30d0)
---
src/core/devices/team/nm-device-team.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c
index b745158ef8..1d2beb5e8a 100644
--- a/src/core/devices/team/nm-device-team.c
+++ b/src/core/devices/team/nm-device-team.c
@@ -228,17 +228,10 @@ update_connection(NMDevice *device, NMConnection *connection)
NMDeviceTeam *self = NM_DEVICE_TEAM(device);
NMSettingTeam *s_team = _nm_connection_ensure_setting(connection, NM_TYPE_SETTING_TEAM);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE(self);
- struct teamdctl *tdc = priv->tdc;
/* Read the configuration only if not already set */
- if (!priv->config && ensure_teamd_connection(device))
+ if (!priv->config && priv->tdc) {
teamd_read_config(self);
-
- /* Restore previous tdc state */
- if (priv->tdc && !tdc) {
- teamdctl_disconnect(priv->tdc);
- teamdctl_free(priv->tdc);
- priv->tdc = NULL;
}
g_object_set(G_OBJECT(s_team), NM_SETTING_TEAM_CONFIG, _get_config(self), NULL);
--
2.40.1

8
NetworkManager.spec
View File

@ -6,7 +6,7 @@
%global epoch_version 1
%global real_version 1.40.16
%global rpm_version %{real_version}
%global release_version 4
%global release_version 5
%global snapshot %{nil}
%global git_sha %{nil}
%global bcond_default_debug 0
@ -198,6 +198,8 @@ Patch3: 0003-order-ipv6-addresses.patch
# Patch1001: 1001-some.patch
Patch1001: 1001-cloud-setup-IMDSv2-rh2151987.patch
Patch1002: 1002-dns-add-support-to-no-aaaa-option-rh2144521.patch
Patch1003: 1003-suppport-bond-port-prio-rh1920398.patch
Patch1004: 1004-team-don-t-try-to-connect-to-teamd-in-update_connect-rh2182029.patch
Requires(post): systemd
%if 0%{?fedora} || 0%{?rhel} >= 8
@ -1233,6 +1235,10 @@ fi
%changelog
* Wed May 17 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.40.16-5
- support bond port prio property (rh #1920398)
- team: don't try to connect to teamd in update_connection() (rh #2182029)
* Wed Apr 19 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.40.16-4
- support the "no-aaaa" resolv.conf option (rh #2144521)