diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-12-16 22:25:39 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-12-16 22:25:39 +0100 |
| commit | 3bb6fe3b74861ff9b8ba7344a767d02465541703 (patch) | |
| tree | ad6efbc243e30590f4e9d21d8c0cf2d1786e601a /src/nm-manager.c | |
| parent | 5cca99074263d8c83cd1c6aff98776979670bb68 (diff) | |
| parent | d4ae2ddbde9ad1f4d0791b07ce33ff7222c84ca9 (diff) | |
| download | NetworkManager-th/nm-1-0-integration.tar.gz | |
Merge branch 'backport-1-0/dcbw/external-managed-iffup-rh1030947' into nm-1-0th/nm-1-0-integration
Diffstat (limited to 'src/nm-manager.c')
| -rw-r--r-- | src/nm-manager.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 06f24abdb8..4c5fff5d76 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1653,7 +1653,9 @@ recheck_assume_connection (NMDevice *device, gpointer user_data) if (manager_sleeping (self)) return FALSE; - if (nm_device_get_unmanaged_flag (device, NM_UNMANAGED_USER)) + if (nm_device_get_unmanaged_flag (device, NM_UNMANAGED_USER) || + nm_device_get_unmanaged_flag (device, NM_UNMANAGED_INTERNAL) || + nm_device_get_unmanaged_flag (device, NM_UNMANAGED_PARENT)) return FALSE; state = nm_device_get_state (device); @@ -1818,6 +1820,8 @@ add_device (NMManager *self, NMDevice *device, gboolean try_assume) sleeping = manager_sleeping (self); nm_device_set_initial_unmanaged_flag (device, NM_UNMANAGED_INTERNAL, sleeping); + nm_device_update_initial_unmanaged_flags (device); + nm_device_dbus_export (device); nm_device_finish_init (device); |