fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 05:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: merge branch 'th/cmdline-log-debug'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=2102313

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1297
This commit is contained in:
Thomas Haller 2022-07-18 15:02:38 +02:00
commit 4ef40700c4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
7 changed files with 67 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
man/NetworkManager.conf.xml
View file

@ -634,6 +634,13 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
early on.
</para>
<para>
By setting <option>nm.debug</option> on the kernel command line (either from
<filename>&nmrundir;/proc-cmdline</filename> or <filename>/proc/cmdline</filename>),
debug logging is enabled. This overrides both the command-line options and the settings
from NetworkManager.conf.
</para>
<para>
NetworkManager's logging aims not to contain private sensitive data
and you should be fine sharing the debug logs. Still, there will

15
src/core/main.c
View file

@ -293,6 +293,7 @@ main(int argc, char *argv[])
GError *error_invalid_logging_config = NULL;
const char *const *warnings;
int errsv;
gboolean has_logging = FALSE;
_nm_utils_is_manager_process = TRUE;
@ -354,10 +355,14 @@ main(int argc, char *argv[])
g_free(path);
}
if (!nm_logging_setup(global_opt.opt_log_level,
global_opt.opt_log_domains,
&bad_domains,
&error)) {
if (nm_config_kernel_command_line_nm_debug()) {
/* we honor kernel command line. If "nm.debug" is set, we always enable trace logging. */
nm_logging_setup("TRACE", "ALL", NULL, NULL);
has_logging = TRUE;
} else if (!nm_logging_setup(global_opt.opt_log_level,
global_opt.opt_log_domains,
&bad_domains,
&error)) {
fprintf(stderr,
_("%s. Please use --help to see a list of valid options.\n"),
error->message);
@ -379,7 +384,7 @@ main(int argc, char *argv[])
/* Initialize logging from config file *only* if not explicitly
* specified by commandline.
*/
if (global_opt.opt_log_level == NULL && global_opt.opt_log_domains == NULL) {
if (!has_logging && !global_opt.opt_log_level && !global_opt.opt_log_domains) {
if (!nm_logging_setup(nm_config_get_log_level(config),
nm_config_get_log_domains(config),
&bad_domains,

7
src/core/nm-config-data.c
View file

@ -839,6 +839,13 @@ nm_config_data_log(const NMConfigData *self,
_LOG(stream, prefix, "# no-auto-default specs \"%s\"", msg);
}
if (nm_config_kernel_command_line_nm_debug()) {
_LOG(stream,
prefix,
"# /proc/cmdline contains \"" NM_CONFIG_KERNEL_CMDLINE_NM_DEBUG
"\". Debug log enabled");
}
#undef _LOG
}

9
src/core/nm-config.c
View file

@ -3014,6 +3014,15 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps
/*****************************************************************************/
gboolean
nm_config_kernel_command_line_nm_debug(void)
{
return (nm_strv_find_first(nm_utils_proc_cmdline_split(), -1, NM_CONFIG_KERNEL_CMDLINE_NM_DEBUG)
>= 0);
}
/*****************************************************************************/
static gboolean
init_sync(GInitable *initable, GCancellable *cancellable, GError **error)
{

6
src/core/nm-config.h
View file

@ -18,6 +18,8 @@
#define NM_IS_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_CONFIG))
#define NM_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_CONFIG, NMConfigClass))
#define NM_CONFIG_KERNEL_CMDLINE_NM_DEBUG "nm.debug"
/* Properties */
#define NM_CONFIG_CMD_LINE_OPTIONS "cmd-line-options"
#define NM_CONFIG_ATOMIC_SECTION_PREFIXES "atomic-section-prefixes"
@ -197,4 +199,8 @@ void nm_config_clear_warnings(NMConfig *config);
/*****************************************************************************/
gboolean nm_config_kernel_command_line_nm_debug(void);
/*****************************************************************************/
#endif /* __NETWORKMANAGER_CONFIG_H__ */

5
src/core/nm-core-utils.c
View file

@ -3090,7 +3090,10 @@ again:
if (G_UNLIKELY(!proc_cmdline)) {
gs_free char *str = NULL;
g_file_get_contents("/proc/cmdline", &str, NULL, NULL);
/* /run/NetworkManager/proc-cmdline can be used to overrule /proc/cmdline. */
if (!g_file_get_contents(NMRUNDIR "/proc-cmdline", &str, NULL, NULL))
g_file_get_contents("/proc/cmdline", &str, NULL, NULL);
str = nm_str_realloc(str);
proc_cmdline = str ?: "";

33
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -2288,9 +2288,11 @@ nm_utils_escaped_tokens_options_split(char *str, const char **out_key, const cha
char **
nm_utils_strsplit_quoted(const char *str)
{
gs_unref_ptrarray GPtrArray *arr = NULL;
gs_free char *str_out = NULL;
CharLookupTable ch_lookup;
char **arr = NULL;
gsize arr_len = 0;
gsize arr_alloc = 0;
gs_free char *str_out = NULL;
CharLookupTable ch_lookup;
nm_assert(str);
@ -2347,19 +2349,32 @@ nm_utils_strsplit_quoted(const char *str)
str++;
}
if (!arr)
arr = g_ptr_array_new();
g_ptr_array_add(arr, g_strndup(str_out, j));
if (arr_len >= arr_alloc) {
if (arr_alloc == 0)
arr_alloc = 4;
else
arr_alloc *= 2;
arr = g_realloc(arr, sizeof(char *) * arr_alloc);
}
arr[arr_len++] = g_strndup(str_out, j);
}
if (!arr)
return g_new0(char *, 1);
g_ptr_array_add(arr, NULL);
/* We want to return an optimally sized strv array, with no excess
* memory allocated. Hence, clone once more. */
return nm_memdup(arr->pdata, sizeof(char *) * arr->len);
if (arr_len + 1u != arr_alloc) {
gs_free char **arr_old = arr;
arr = g_new(char *, arr_len + 1u);
memcpy(arr, arr_old, sizeof(char *) * arr_len);
}
arr[arr_len] = NULL;
return arr;
}
/*****************************************************************************/