diff options
| author | Michael Biebl <biebl@debian.org> | 2019-11-25 18:54:42 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-11-25 18:54:42 +0100 |
| commit | 56e2e0e97cd4786bf3b1f7fd607d4a9e4fc6bc8d (patch) | |
| tree | 43de6f27b10e23ff907dbe4e2c8fe0e52f01b13b /src/nm-manager.c | |
| parent | 85b54c33239239aa9ec8ff2f128f25a72dd587e1 (diff) | |
| parent | e22609983008e1a669196ad64ba3a59ae8c76e0d (diff) | |
Update upstream source from tag 'upstream/1.20.8'
Update to upstream version '1.20.8' with Debian dir 5fbac145116049621c01e7eb75da24ed4f79d25e
Diffstat (limited to 'src/nm-manager.c')
| -rw-r--r-- | src/nm-manager.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 78f3722c..d112fcf7 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2741,6 +2741,12 @@ recheck_assume_connection (NMManager *self, activation_type_assume = TRUE; if (generated) { + /* Reset the IPv4 setting to empty method=auto, regardless of what assumption guessed. */ + nm_connection_add_setting (nm_settings_connection_get_connection (sett_conn), + g_object_new (NM_TYPE_SETTING_IP4_CONFIG, + NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, + NULL)); + nm_settings_connection_update (sett_conn, NULL, NM_SETTINGS_CONNECTION_PERSIST_MODE_KEEP, |