diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-08-18 08:31:29 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-08-18 08:31:29 -0400 |
| commit | b0887dd4d035acc0d84aa859748d36891548eaaf (patch) | |
| tree | c4dc0dae50954f3c8fb600aa9e7cfaabeb80deb0 /src/core/nm-config-data.c | |
| parent | 1a62dcfdc0470be37743914da69fe0b0677c6bfb (diff) | |
| parent | 4741f1a52215c7ba466140912084d6906185bef3 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'src/core/nm-config-data.c')
| -rw-r--r-- | src/core/nm-config-data.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c index ddb7787f..0f512e38 100644 --- a/src/core/nm-config-data.c +++ b/src/core/nm-config-data.c @@ -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 } @@ -1681,7 +1688,7 @@ nm_config_data_get_connection_default_int64(const NMConfigData *self, const char *value; value = nm_config_data_get_connection_default(self, property, device); - return _nm_utils_ascii_str_to_int64(value, 10, min, max, fallback); + return _nm_utils_ascii_str_to_int64(value, 0, min, max, fallback); } static const char * |