diff options
| -rw-r--r-- | debian/patches/Do-not-manage-Docker-bridge-interfaces.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch b/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch new file mode 100644 index 00000000..9525cc2a --- /dev/null +++ b/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch @@ -0,0 +1,24 @@ +From: Andrei Dziahel <develop7@develop7.info> +Date: Mon, 17 Sep 2018 10:03:15 +0000 +Subject: Do not manage Docker bridge interfaces + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/15 +(cherry picked from commit 0ce73275506e8d3156b8d3cd9ca7a1105c5dc4fb) +--- + 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 edc4ddb..20f4d29 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" + ++# 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). diff --git a/debian/patches/series b/debian/patches/series index 6da89bb7..fdf5b213 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +Do-not-manage-Docker-bridge-interfaces.patch Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch Don-t-make-NetworkManager-D-Bus-activatable.patch |