diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2022-05-27 10:34:27 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2022-06-23 09:50:50 +0200 |
| commit | acdd31ed8d5b136f9d53f2e188816dab208dba0c (patch) | |
| tree | d9fc6960964a21b351e8bb51a2f22501f3745dab | |
| parent | 2c5846feec47c5378a72c385a1503aa0a8818df9 (diff) | |
| download | NetworkManager-acdd31ed8d5b136f9d53f2e188816dab208dba0c.tar.gz | |
initrd: add comment on top of connections and conf snippets
Example:
$ cat /run/NetworkManager/conf.d/15-carrier-timeout.conf
# Created by nm-initrd-generator (from "rd.net.timeout.carrier")
[device-15-carrier-timeout]
match-device=*
carrier-wait-timeout=12000
| -rw-r--r-- | src/nm-initrd-generator/nm-initrd-generator.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/nm-initrd-generator/nm-initrd-generator.c b/src/nm-initrd-generator/nm-initrd-generator.c index f6380fb07b..02588b3c7a 100644 --- a/src/nm-initrd-generator/nm-initrd-generator.c +++ b/src/nm-initrd-generator/nm-initrd-generator.c @@ -26,6 +26,18 @@ /*****************************************************************************/ static void +add_keyfile_comment(GKeyFile *keyfile, char *reason) +{ + gs_free char *comment = NULL; + + comment = g_strdup_printf(" Created by nm-initrd-generator%s%s%s", + reason ? " (" : "", + reason ? reason : "", + reason ? ")" : ""); + g_key_file_set_comment(keyfile, NULL, NULL, comment, NULL); +} + +static void output_conn(gpointer key, gpointer value, gpointer user_data) { const char *basename = key; @@ -48,9 +60,12 @@ output_conn(gpointer key, gpointer value, gpointer user_data) goto err_out; file = nm_keyfile_write(connection, NM_KEYFILE_HANDLER_FLAGS_NONE, NULL, NULL, &error); - if (file == NULL) + if (!file) goto err_out; + if (connections_dir) + add_keyfile_comment(file, NULL); + data = g_key_file_to_data(file, &len, &error); if (!data) goto err_out; @@ -198,6 +213,8 @@ main(int argc, char *argv[]) NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE "-15-carrier-timeout", NM_CONFIG_KEYFILE_KEY_DEVICE_CARRIER_WAIT_TIMEOUT, carrier_timeout_sec * 1000); + if (!dump_to_stdout) + add_keyfile_comment(keyfile, "from \"rd.net.timeout.carrier\""); v = (NMUtilsNamedValue){ .name = g_strdup_printf("%s/15-carrier-timeout.conf", run_config_dir), |