From aee3bc0a339650eae66313e17dd5802092507d37 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 10 Sep 2018 10:36:49 +0200 Subject: [PATCH] device: mark wireguard devices as unmanaged Later we want to fully support wireguard devices. Also, possibly activating a generic profile in a wireguard device would make sense. Anyway, for the moment, just prevent that from happening by explicitly marking the device as unmanaged. (cherry picked from commit e3bd482329344b1d7f31b29fea2814ba5ce97d79) --- src/devices/nm-device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 95a2bc5a9e..c5f30ea28a 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -83,6 +83,7 @@ #include "nm-device-generic.h" #include "nm-device-vlan.h" +#include "nm-device-wireguard.h" #include "nm-device-logging.h" _LOG_DECLARE_SELF (NMDevice); @@ -4301,7 +4302,10 @@ realize_start_setup (NMDevice *self, /* Unmanaged the loopback device with an explicit NM_UNMANAGED_BY_TYPE flag. * Later we might want to manage 'lo' too. Currently that doesn't work because * NetworkManager might down the interface or remove the 127.0.0.1 address. */ - nm_device_set_unmanaged_flags (self, NM_UNMANAGED_BY_TYPE, is_loopback (self)); + nm_device_set_unmanaged_flags (self, + NM_UNMANAGED_BY_TYPE, + is_loopback (self) + || NM_IS_DEVICE_WIREGUARD (self)); nm_device_set_unmanaged_by_user_udev (self); nm_device_set_unmanaged_by_user_conf (self);