From c516dca0d5d9d9d774570656b3be0eff62411c84 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 16 Nov 2017 09:20:52 +0100 Subject: [PATCH] device: start managing external devices on reapply In the next commit we will modify ipX_config_merge_and_apply to never touch external devices. When a "reapply" call is issued on an external device we are no longer simply tracking its state but we are actively managing it and so its sys-iface-state must be promoted to managed. https://bugzilla.redhat.com/show_bug.cgi?id=1512316 (cherry picked from commit 9e41ed446176acc3f82cf23c3b6d7692ffa7b5b3) --- src/devices/nm-device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c87f660c12..0290bc2221 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -9444,6 +9444,9 @@ reapply_cb (NMDevice *self, return; } + if (nm_device_sys_iface_state_is_external (self)) + nm_device_sys_iface_state_set (self, NM_DEVICE_SYS_IFACE_STATE_MANAGED); + if (!check_and_reapply_connection (self, connection ? : (NMConnection *) nm_device_get_settings_connection (self), version_id,