From 7f4dff3943c64e1d0e5d13b2ac915088dde165e6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Jan 2017 21:09:50 +0100 Subject: New upstream version 1.6.0 --- src/nm-manager.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/nm-manager.c') diff --git a/src/nm-manager.c b/src/nm-manager.c index 867e0db6..0c1d36e1 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -3122,6 +3122,13 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError * } } + /* Now that we're activating a slave for that master, make sure the master just + * decides to go unmanaged while we're activating (perhaps because other slaves + * go away leaving him with no kids). + */ + nm_device_set_unmanaged_by_flags (master_device, NM_UNMANAGED_EXTERNAL_DOWN, + NM_UNMAN_FLAG_OP_FORGET, NM_DEVICE_STATE_REASON_USER_REQUESTED); + nm_active_connection_set_master (active, master_ac); _LOGD (LOGD_CORE, "Activation of '%s' depends on active connection %p %s", nm_settings_connection_get_id (connection), -- cgit 1.3.0-6-gf8a5