summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-05-20 13:36:49 +0200
committerLubomir Rintel <lkundrak@v3.sk>2019-05-21 09:40:53 +0200
commit4c78434a0bf5a7fbf8ceafb0d07440f3fc7a2b71 (patch)
tree943687ea790467b3036a1e0caeea367d56efdf07
parentf3f8e21bd31a64e994a3cabeedea5242674f7f3c (diff)
downloadNetworkManager-4c78434a0bf5a7fbf8ceafb0d07440f3fc7a2b71.tar.gz
Revert "Do not manage Docker bridge interfaces"
The docker bridges are no special -- just regular externally created bridges. This reverts commit 0ce73275506e8d3156b8d3cd9ca7a1105c5dc4fb.
-rw-r--r--data/85-nm-unmanaged.rules3
1 files changed, 0 insertions, 3 deletions
diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules
index 20f4d29a1c..edc4ddbe79 100644
--- a/data/85-nm-unmanaged.rules
+++ b/data/85-nm-unmanaged.rules
@@ -26,9 +26,6 @@ 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"
-# Docker bridge. Managed by docker daemon.
-ATTR{address}=="02:42:*", ENV{INTERFACE}=="docker[0-9]*", 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).