base: networkmanager: 1.38 -> 1.40

- Update patches with devtool | Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch | patching file data/85-nm-unmanaged.rules | Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines). Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose · Jul 15, 2024 · 3d0cd68 · 3d0cd68
1 parent 5ce2f5b
commit 3d0cd68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...tworkmanager/networkmanager/0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch b/...tworkmanager/networkmanager/0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
@@ -1,4 +1,4 @@
-From 73d43ee3a152082c24cc0831f17bc0a118f7f8ff Mon Sep 17 00:00:00 2001
+From 90dc44441ecbcf44f3ec80b8bb0ffc87de1a7d92 Mon Sep 17 00:00:00 2001
 From: Ricardo Salveti <[email protected]>
 Date: Tue, 4 Jan 2022 19:44:15 -0300
 Subject: [PATCH] 85-nm-unmanaged.rules: do not manage docker bridges
@@ -18,24 +18,22 @@ fix.
 Upstream-Status: Inappropriate [lmp specific]
 
 Signed-off-by: Ricardo Salveti <[email protected]>
+
 ---
  data/85-nm-unmanaged.rules | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules
-index edc4ddbe79..7ad85dd0b5 100644
+index b4f805c..008c7f1 100644
 --- a/data/85-nm-unmanaged.rules
 +++ b/data/85-nm-unmanaged.rules
-@@ -26,6 +26,9 @@ ATTR{address}=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1"
- # in another net namespace and managed by libvirt, Docker or the like.
- ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1"
+@@ -30,6 +30,9 @@ ATTR{address}=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1"
+ # LXD situation, let's treat the devices called eth* as regular ethernet.
+ ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}!="eth[0-9]*", ENV{NM_UNMANAGED}="1"
 
 +# Docker bridges. Managed by docker daemon.
 +ATTR{address}=="02:42:*", ENV{INTERFACE}=="docker[0-9]*|br-*", ENV{NM_UNMANAGED}="1"
 +
  # USB gadget device. Unmanage by default, since whatever created it
  # might want to set it up itself (e.g. activate an ipv4.method=shared
  # connection).
--- 
-2.34.1
-
diff --git a/...orkmanager/networkmanager_1.38.%.bbappend → ...orkmanager/networkmanager_1.40.%.bbappend b/...orkmanager/networkmanager_1.38.%.bbappend → ...orkmanager/networkmanager_1.40.%.bbappend