From 17db5b8761cf4a2b97f67ab2b9d760a0621674b9 Mon Sep 17 00:00:00 2001 From: shaojiansong Date: Thu, 5 Dec 2024 15:04:40 +0800 Subject: [PATCH] fix the race condition which may cause nm-unmanaged rules not work. --- NetworkManager.spec | 9 ++++- ...ix_race_condition_nm_unmanaged_rules.patch | 37 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 backport_fix_race_condition_nm_unmanaged_rules.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 85fa22f..375dcd7 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -48,7 +48,7 @@ Name: NetworkManager Version: 1.26.2 Epoch: 1 -Release: 14 +Release: 15 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://www.gnome.org/projects/NetworkManager/ @@ -66,6 +66,7 @@ Patch7: backport-core-ovs-fix-leak-of-NMOvsdbPrivate-db_uuid.patch Patch8: backport-libnm-fix-leak-and-return-failures-from-nm-client-load-connections.patch Patch9: bugfix-use-PartOf-replace-Requires-in-service.patch Patch10: backport-avoid-logging-warning-to-set-ad_actor_system.patch +Patch11: backport_fix_race_condition_nm_unmanaged_rules.patch BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel @@ -437,6 +438,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Thu Dec 05 2024 shaojiansong - 1:1.26.2-15 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix the race condition which may cause nm-unmanaged rules not work. + * Tue Aug 27 2024 Yu Peng - 1:1.26.2-14 - Type:bugfix - ID:NA diff --git a/backport_fix_race_condition_nm_unmanaged_rules.patch b/backport_fix_race_condition_nm_unmanaged_rules.patch new file mode 100644 index 0000000..fc367b0 --- /dev/null +++ b/backport_fix_race_condition_nm_unmanaged_rules.patch @@ -0,0 +1,37 @@ +#upstream pr: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/b57c1af81448a8e7b57f56d910d2354e2a247c87 +diff -Naur NetworkManager-1.26.2/data/84-nm-drivers.rules NetworkManager-1.26.2-update/data/84-nm-drivers.rules +--- NetworkManager-1.26.2/data/84-nm-drivers.rules 2020-08-19 05:05:13.000000000 +0800 ++++ NetworkManager-1.26.2-update/data/84-nm-drivers.rules 2024-12-05 14:55:42.584015923 +0800 +@@ -2,7 +2,7 @@ + # To override or extend the rules place a file in /etc/udev/rules.d + + SUBSYSTEM!="net", GOTO="nm_drivers_end" +-ACTION!="add|change", GOTO="nm_drivers_end" ++ACTION!="add|change|move", GOTO="nm_drivers_end" + + # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) + ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" +diff -Naur NetworkManager-1.26.2/data/85-nm-unmanaged.rules NetworkManager-1.26.2-update/data/85-nm-unmanaged.rules +--- NetworkManager-1.26.2/data/85-nm-unmanaged.rules 2020-08-19 05:05:13.000000000 +0800 ++++ NetworkManager-1.26.2-update/data/85-nm-unmanaged.rules 2024-12-05 14:55:02.926461301 +0800 +@@ -2,7 +2,7 @@ + # To override or extend the rules place a file in /etc/udev/rules.d + + SUBSYSTEM!="net", GOTO="nm_unmanaged_end" +-ACTION!="add|change", GOTO="nm_unmanaged_end" ++ACTION!="add|change|move", GOTO="nm_unmanaged_end" + + # VirtualBox host networking. Out-of-tree driver that looks like an ordinary + # Ethernet. No parent device (lives in /virtual/), no support for ethtool +diff -Naur NetworkManager-1.26.2/data/90-nm-thunderbolt.rules NetworkManager-1.26.2-update/data/90-nm-thunderbolt.rules +--- NetworkManager-1.26.2/data/90-nm-thunderbolt.rules 2020-05-22 22:01:40.000000000 +0800 ++++ NetworkManager-1.26.2-update/data/90-nm-thunderbolt.rules 2024-12-05 14:56:20.319543665 +0800 +@@ -1,7 +1,7 @@ + # Do not modify this file, it will get overwritten on updates. + # To override or extend the rules place a file in /etc/udev/rules.d + +-ACTION!="add", GOTO="nm_thunderbolt_end" ++ACTION!="add|change|move", GOTO="nm_thunderbolt_end" + + # Load he thunderbolt-net driver if we a device of type thunderbolt_xdomain + # is added. -- Gitee