diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-22 16:41:15 +0100 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-22 17:37:56 +0100 |
commit | dc0e22d4b912460e3928f3cf2cb8cd5bff14acf4 (patch) | |
tree | f7e7e4e4869a6a12f466e9cf393360ef2a504767 | |
parent | 7d2e43a455c2ffa5a68c98cc01265231c529a130 (diff) | |
download | NetworkManager-dc0e22d4b912460e3928f3cf2cb8cd5bff14acf4.tar.gz |
platform: give the platform an opportunity to override default-unmanaged
Some out of tree drivers add Ethernet devices that are supposed to be managed
by other their tooling, e.g. VirtualBox or VMWare.
Rather than hardcoding their drivers (at least VirtualBox doesn't even set a
"driver" property in sysfs) or hardcoding a logic that identifies such devices
let's just add a possibility to blacklist them in udev. This makes it possible
for whoever who ships such a driver to ship rules that prevent NetworkManager
from managing the device itself.
Furthermore it makes it possible for the user with special needs leverage the
flexibility of udev rules to override the defaults. In the ent the user can
decide to let NetworkManager manage default-unmanaged interfaces such as VEth
or turn on default-unmanaged for devices on a particular bus.
An udev rule for VirtualBox would look like this:
SUBSYSTEM=="net", ENV{INTERFACE}=="vboxnet[0-9]*", ENV{NM_UNMANAGED}="1"
-rw-r--r-- | src/nm-manager.c | 5 | ||||
-rw-r--r-- | src/platform/nm-fake-platform.c | 7 | ||||
-rw-r--r-- | src/platform/nm-linux-platform.c | 15 | ||||
-rw-r--r-- | src/platform/nm-platform.c | 19 | ||||
-rw-r--r-- | src/platform/nm-platform.h | 2 |
5 files changed, 47 insertions, 1 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index ac89dafbcb..930f9d61a4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1779,7 +1779,7 @@ add_device (NMManager *self, NMDevice *device, gboolean try_assume) NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); const char *iface, *driver, *type_desc; const GSList *unmanaged_specs; - gboolean user_unmanaged, sleeping; + gboolean user_unmanaged, sleeping, platform_unmanaged; gboolean enabled = FALSE; RfKillType rtype; GSList *iter, *remove = NULL; @@ -1855,6 +1855,9 @@ add_device (NMManager *self, NMDevice *device, gboolean try_assume) user_unmanaged = nm_device_spec_match_list (device, unmanaged_specs); nm_device_set_initial_unmanaged_flag (device, NM_UNMANAGED_USER, user_unmanaged); + if (nm_platform_link_get_unmanaged (nm_device_get_ifindex (device), &platform_unmanaged)) + nm_device_set_initial_unmanaged_flag (device, NM_UNMANAGED_DEFAULT, platform_unmanaged); + sleeping = manager_sleeping (self); nm_device_set_initial_unmanaged_flag (device, NM_UNMANAGED_INTERNAL, sleeping); diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index b4bad844f0..5f862318d8 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -273,6 +273,12 @@ link_get_type_name (NMPlatform *platform, int ifindex) return type_to_type_name (link_get_type (platform, ifindex)); } +static gboolean +link_get_unmanaged (NMPlatform *platform, int ifindex, gboolean *managed) +{ + return TRUE; +} + static void link_changed (NMPlatform *platform, NMFakePlatformLink *device) { @@ -1294,6 +1300,7 @@ nm_fake_platform_class_init (NMFakePlatformClass *klass) platform_class->link_get_name = link_get_name; platform_class->link_get_type = link_get_type; platform_class->link_get_type_name = link_get_type_name; + platform_class->link_get_unmanaged = link_get_unmanaged; platform_class->link_set_up = link_set_up; platform_class->link_set_down = link_set_down; diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index a03abbebb3..f1fdf5e9fa 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -2402,6 +2402,20 @@ link_get_type_name (NMPlatform *platform, int ifindex) return type; } +static gboolean +link_get_unmanaged (NMPlatform *platform, int ifindex, gboolean *managed) +{ + NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); + GUdevDevice *udev_device = g_hash_table_lookup (priv->udev_devices, GINT_TO_POINTER (ifindex)); + + if (g_udev_device_get_property (udev_device, "NM_UNMANAGED")) { + *managed = g_udev_device_get_property_as_boolean (udev_device, "NM_UNMANAGED"); + return TRUE; + } + + return FALSE; +} + static guint32 link_get_flags (NMPlatform *platform, int ifindex) { @@ -4541,6 +4555,7 @@ nm_linux_platform_class_init (NMLinuxPlatformClass *klass) platform_class->link_get_name = link_get_name; platform_class->link_get_type = link_get_type; platform_class->link_get_type_name = link_get_type_name; + platform_class->link_get_unmanaged = link_get_unmanaged; platform_class->link_refresh = link_refresh; diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index a2fd8f39a4..11af35a936 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -652,6 +652,25 @@ nm_platform_link_get_type_name (int ifindex) } /** + * nm_platform_link_get_unmanaged: + * @ifindex: Interface index. + * @managed: Management status in case %TRUE is returned + * + * Returns: %TRUE if platform overrides whether the device ought + * to be managed by default. %FALSE with @managed unmodified + * otherwise. + */ +gboolean +nm_platform_link_get_unmanaged (int ifindex, gboolean *managed) +{ + reset_error (); + + g_return_val_if_fail (klass->link_get_unmanaged, NULL); + + return klass->link_get_unmanaged (platform, ifindex, managed); +} + +/** * nm_platform_link_is_software: * @ifindex: Interface index. * diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index b202de32a1..e14d98a3b6 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -351,6 +351,7 @@ typedef struct { const char *(*link_get_name) (NMPlatform *, int ifindex); NMLinkType (*link_get_type) (NMPlatform *, int ifindex); const char *(*link_get_type_name) (NMPlatform *, int ifindex); + gboolean (*link_get_unmanaged) (NMPlatform *, int ifindex, gboolean *managed); gboolean (*link_refresh) (NMPlatform *, int ifindex); @@ -496,6 +497,7 @@ int nm_platform_link_get_ifindex (const char *name); const char *nm_platform_link_get_name (int ifindex); NMLinkType nm_platform_link_get_type (int ifindex); const char *nm_platform_link_get_type_name (int ifindex); +gboolean nm_platform_link_get_unmanaged (int ifindex, gboolean *managed); gboolean nm_platform_link_is_software (int ifindex); gboolean nm_platform_link_supports_slaves (int ifindex); |