diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-05-24 11:11:01 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-05-24 11:11:01 +0200 |
| commit | 1f8b44a7d134d40b4213fc253427c4ff14f232bd (patch) | |
| tree | 7471958ee9edb2fc7a828e9b3398cf9d88017a48 | |
| parent | fc377b9a0cb62037c3a1d6549b34465dfdc2ae05 (diff) | |
* d/p/Read-system-connections-from-run.patch:
- remove, upstream addressed it in a different way/for different
reasons in commit ce4dbd7daf.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/Read-system-connections-from-run.patch | 46 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 8 insertions, 47 deletions
diff --git a/debian/changelog b/debian/changelog index 47e76716..d1ef4677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.18.0-1ubuntu3) UNRELEASED; urgency=medium + + * d/p/Read-system-connections-from-run.patch: + - remove, upstream addressed it in a different way/for different + reasons in commit ce4dbd7daf. + + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 24 May 2019 11:09:56 +0200 + network-manager (1.18.0-1ubuntu2) eoan; urgency=medium * debian/control, debian/lib*.install, debian/rules: diff --git a/debian/patches/Read-system-connections-from-run.patch b/debian/patches/Read-system-connections-from-run.patch deleted file mode 100644 index fb4fa55d..00000000 --- a/debian/patches/Read-system-connections-from-run.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Tue, 21 Jun 2016 17:22:12 +0200 -Subject: Read system-connections from /run - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=773069 -Bug-Ubuntu: https://launchpad.net/bugs/1594551 ---- - src/settings/plugins/keyfile/nms-keyfile-plugin.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -Index: network-manager-1.18.0/src/settings/plugins/keyfile/nms-keyfile-plugin.c -=================================================================== ---- network-manager-1.18.0.orig/src/settings/plugins/keyfile/nms-keyfile-plugin.c -+++ network-manager-1.18.0/src/settings/plugins/keyfile/nms-keyfile-plugin.c -@@ -416,6 +416,8 @@ _sort_paths (const char **f1, const char - return strcmp (*f1, *f2); - } - -+#define NM_CONFIG_KEYFILE_PATH_RUNTIME "/run/NetworkManager/system-connections" -+ - static void - _read_dir (GPtrArray *filenames, - const char *path, -@@ -461,6 +463,22 @@ read_connections (NMSettingsPlugin *conf - - alive_connections = g_hash_table_new (nm_direct_hash, NULL); - -+ /* Now add files from /run too, unless they have a file in /etc */ -+ dir = g_dir_open (NM_CONFIG_KEYFILE_PATH_RUNTIME, 0, &error); -+ if (dir) { -+ while ((item = g_dir_read_name (dir))) { -+ g_autofree char *etc_file = g_build_filename (nms_keyfile_utils_get_path (), item, NULL); -+ if (nms_keyfile_utils_should_ignore_file (item) || g_access (etc_file, F_OK) == 0) -+ continue; -+ g_ptr_array_add (filenames, g_build_filename (NM_CONFIG_KEYFILE_PATH_RUNTIME, item, NULL)); -+ } -+ g_dir_close (dir); -+ } else { -+ nm_log_dbg (LOGD_SETTINGS, "keyfile: cannot read directory " NM_CONFIG_KEYFILE_PATH_RUNTIME ": %s", -+ error->message); -+ g_clear_error (&error); -+ } -+ - /* While reloading, we don't replace connections that we already loaded while - * iterating over the files. - * diff --git a/debian/patches/series b/debian/patches/series index fd2a34f5..f3f8df16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch Update-dnsmasq-parameters.patch Disable-general-with-expect.patch libnm-Check-self-still-NMManager-or-not.patch -Read-system-connections-from-run.patch |