diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/Read-system-connections-from-run.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 18 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 851c5dcf..c6a9cc21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.18.0-1ubuntu2) UNRELEASED; urgency=medium + + * debian/patches/series: + - restore Read-system-connections-from-run.patch which had been + dropped by error. + + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 24 May 2019 00:02:51 +0200 + network-manager (1.18.0-1ubuntu1) eoan; urgency=medium * Update to 1.18, merge on Debian, new version includes nwe support for diff --git a/debian/patches/Read-system-connections-from-run.patch b/debian/patches/Read-system-connections-from-run.patch index 69790014..fb4fa55d 100644 --- a/debian/patches/Read-system-connections-from-run.patch +++ b/debian/patches/Read-system-connections-from-run.patch @@ -8,22 +8,22 @@ 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.12.2/src/settings/plugins/keyfile/nms-keyfile-plugin.c +Index: network-manager-1.18.0/src/settings/plugins/keyfile/nms-keyfile-plugin.c =================================================================== ---- network-manager-1.12.2.orig/src/settings/plugins/keyfile/nms-keyfile-plugin.c -+++ network-manager-1.12.2/src/settings/plugins/keyfile/nms-keyfile-plugin.c -@@ -411,6 +411,8 @@ _sort_paths (const char **f1, const char +--- 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_connections (NMSettingsPlugin *config) - { -@@ -446,6 +448,22 @@ read_connections (NMSettingsPlugin *conf - } - g_dir_close (dir); + _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); diff --git a/debian/patches/series b/debian/patches/series index f3f8df16..fd2a34f5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 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 |