Blame SOURCES/0006-no-keyfile-file-name-extension-rh1697858.patch
|
 |
97acb4 |
From d943f1093603176864cd029a013d4216ef5f277f Mon Sep 17 00:00:00 2001
|
|
|
b1b5c9 |
From: Thomas Haller <thaller@redhat.com>
|
|
|
b1b5c9 |
Date: Tue, 9 Apr 2019 18:00:21 +0200
|
|
|
97acb4 |
Subject: [PATCH] Revert "keyfile: also add ".nmconnection" extension when
|
|
|
b1b5c9 |
writing keyfiles in /etc"
|
|
|
b1b5c9 |
|
|
|
b1b5c9 |
This reverts commit d37ad15f12bafd91cf724cda50aea7093e04bf7a.
|
|
|
b1b5c9 |
---
|
|
|
b1b5c9 |
src/settings/plugins/keyfile/nms-keyfile-writer.c | 7 +++++--
|
|
|
b1b5c9 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
b1b5c9 |
|
|
|
b1b5c9 |
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
|
|
|
97acb4 |
index 2e06aeb9da69..ee652881d60b 100644
|
|
|
b1b5c9 |
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
|
|
|
b1b5c9 |
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
|
|
|
b1b5c9 |
@@ -357,16 +357,19 @@ nms_keyfile_writer_connection (NMConnection *connection,
|
|
|
b1b5c9 |
GError **error)
|
|
|
b1b5c9 |
{
|
|
|
b1b5c9 |
const char *keyfile_dir;
|
|
|
b1b5c9 |
+ gboolean with_extension = FALSE;
|
|
|
b1b5c9 |
|
|
|
b1b5c9 |
if (save_to_disk)
|
|
|
b1b5c9 |
keyfile_dir = nms_keyfile_utils_get_path ();
|
|
|
b1b5c9 |
- else
|
|
|
b1b5c9 |
+ else {
|
|
|
b1b5c9 |
keyfile_dir = NM_KEYFILE_PATH_NAME_RUN;
|
|
|
b1b5c9 |
+ with_extension = TRUE;
|
|
|
b1b5c9 |
+ }
|
|
|
b1b5c9 |
|
|
|
b1b5c9 |
return _internal_write_connection (connection,
|
|
|
b1b5c9 |
keyfile_dir,
|
|
|
b1b5c9 |
nms_keyfile_utils_get_path (),
|
|
|
b1b5c9 |
- TRUE,
|
|
|
b1b5c9 |
+ with_extension,
|
|
|
b1b5c9 |
0,
|
|
|
b1b5c9 |
0,
|
|
|
b1b5c9 |
existing_path,
|
|
|
b1b5c9 |
--
|
|
|
97acb4 |
2.21.0
|
|
|
b1b5c9 |
|