diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-12-01 14:02:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-05 21:24:22 +0100 |
| commit | 7e5b861f6189191e94b68150e8afdb081cb4e280 (patch) | |
| tree | dba90186c97ab689bb608fc279d354f0b600806b | |
| parent | 12a36a06084d874692ce2214215ca9572c86c80f (diff) | |
| download | NetworkManager-7e5b861f6189191e94b68150e8afdb081cb4e280.tar.gz | |
settings: block autoconnect of volatile connections
(cherry picked from commit c385cc51079d47141317c16889e38ac6f77ea8a6)
| -rw-r--r-- | src/settings/nm-settings-connection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 0300c9f329..55afb4e60a 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -2751,7 +2751,8 @@ nm_settings_connection_autoconnect_is_blocked (NMSettingsConnection *self) NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self); return priv->autoconnect_blocked_reason != NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE - || priv->autoconnect_retries == 0; + || priv->autoconnect_retries == 0 + || NM_FLAGS_HAS (nm_settings_connection_get_flags (self), NM_SETTINGS_CONNECTION_FLAGS_VOLATILE); } /*****************************************************************************/ |