diff options
author | Pavel Šimerda <psimerda@redhat.com> | 2014-03-07 06:42:36 +0100 |
---|---|---|
committer | Pavel Šimerda <psimerda@redhat.com> | 2014-04-02 15:50:44 +0200 |
commit | d5016776984842d81b736dc649b4d96986d0e413 (patch) | |
tree | 7e444ca972b630aed2527365ef7fa415304507ad | |
parent | ece92fe67a92824648022fadb4b0ec6fa74fc7ed (diff) | |
download | NetworkManager-pavlix/unmanaged.tar.gz |
don't manage virtual devicespavlix/unmanaged
-rw-r--r-- | src/devices/nm-device.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 7e2f034ec8..fc46d68b32 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6600,6 +6600,7 @@ nm_device_state_changed (NMDevice *device, priv->in_state_changed = TRUE; g_return_if_fail (NM_IS_DEVICE (device)); + g_return_if_fail (priv->manager_managed); /* Do nothing if state isn't changing, but as a special case allow * re-setting UNAVAILABLE if the device is missing firmware so that we @@ -7160,6 +7161,10 @@ nm_device_set_manager_managed (NMDevice *device, gboolean was_managed, now_managed; g_return_if_fail (NM_IS_DEVICE (device)); + g_return_if_fail (nm_device_get_iface(device)); + g_return_if_fail (!!strncmp(nm_device_get_iface(device), "virbr", 5)); + g_return_if_fail (!!strncmp(nm_device_get_iface(device), "veth", 4)); + g_return_if_fail (!!strncmp(nm_device_get_iface(device), "vnet", 4)); priv = NM_DEVICE_GET_PRIVATE (device); |