colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: turn off "unmanaged unless IFF_UP externally" for veth

Browse Source 
We currently don't manage a veth inside a container despite we should because
it's an externally configured software interface and thus waits for IFF_UP.

Given veths are prevented from being managed outside of a container by an udev
rule anyway it's safe to lift the external IFF_UP requirement for them.
This commit is contained in:
Lubomir Rintel
2015-04-07 14:24:12 +02:00
parent adb6e9afb1
commit bcc79cc0eb
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/devices/nm-device-veth.c
View File

@@ -96,6 +96,15 @@ get_peer (NMDeviceVeth *self)
return priv->peer; return priv->peer;
} }
static gboolean
can_unmanaged_external_down (NMDevice *self)
{
/* Unless running in a container, an udev rule causes these to be
* unmanaged. If there's no udev then we're probably in a container
* and should IFF_UP and configure the veth ourselves even if we
* didn't create it. */
return FALSE;
}
/**************************************************************/ /**************************************************************/
@@ -140,12 +149,15 @@ static void
nm_device_veth_class_init (NMDeviceVethClass *klass) nm_device_veth_class_init (NMDeviceVethClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
g_type_class_add_private (klass, sizeof (NMDeviceVethPrivate)); g_type_class_add_private (klass, sizeof (NMDeviceVethPrivate));
object_class->get_property = get_property; object_class->get_property = get_property;
object_class->dispose = dispose; object_class->dispose = dispose;
device_class->can_unmanaged_external_down = can_unmanaged_external_down;
/* properties */ /* properties */
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PEER, (object_class, PROP_PEER,