You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.4 KiB
40 lines
1.4 KiB
5 years ago
|
From a67de1d4f7025f86701c1e2cc319238cbbc88f98 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Haller <thaller@redhat.com>
|
||
|
|
Date: Tue, 9 Apr 2019 18:00:21 +0200
|
||
|
|
Subject: [PATCH 1/1] Revert "keyfile: also add ".nmconnection" extension when
|
||
|
|
writing keyfiles in /etc"
|
||
|
|
|
||
|
|
This reverts commit d37ad15f12bafd91cf724cda50aea7093e04bf7a.
|
||
|
|
---
|
||
|
|
src/settings/plugins/keyfile/nms-keyfile-writer.c | 7 +++++--
|
||
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
|
||
|
|
index 8c75d8c79..fe05df28e 100644
|
||
|
|
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
|
||
|
|
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
|
||
|
|
@@ -357,16 +357,19 @@ nms_keyfile_writer_connection (NMConnection *connection,
|
||
|
|
GError **error)
|
||
|
|
{
|
||
|
|
const char *keyfile_dir;
|
||
|
|
+ gboolean with_extension = FALSE;
|
||
|
|
|
||
|
|
if (save_to_disk)
|
||
|
|
keyfile_dir = nms_keyfile_utils_get_path ();
|
||
|
|
- else
|
||
|
|
+ else {
|
||
|
|
keyfile_dir = NM_KEYFILE_PATH_NAME_RUN;
|
||
|
|
+ with_extension = TRUE;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
return _internal_write_connection (connection,
|
||
|
|
keyfile_dir,
|
||
|
|
nms_keyfile_utils_get_path (),
|
||
|
|
- TRUE,
|
||
|
|
+ with_extension,
|
||
|
|
0,
|
||
|
|
0,
|
||
|
|
existing_path,
|
||
|
|
--
|
||
|
|
2.20.1
|