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.h | |
| parent | 1a62dcfdc0470be37743914da69fe0b0677c6bfb (diff) | |
| parent | 4741f1a52215c7ba466140912084d6906185bef3 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'src/core/nm-config.h')
| -rw-r--r-- | src/core/nm-config.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/core/nm-config.h b/src/core/nm-config.h index 2c23ff20..0dd159f4 100644 --- a/src/core/nm-config.h +++ b/src/core/nm-config.h @@ -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" @@ -183,9 +185,8 @@ gboolean nm_config_device_state_write(int NMTernary nm_owned, guint32 route_metric_default_aspired, guint32 route_metric_default_effective, - const char *next_server, - const char *root_path, - const char *dhcp_bootfile); + NMDhcpConfig *dhcp4_config, + NMDhcpConfig *dhcp6_config); void nm_config_device_state_prune_stale(GHashTable *preserve_ifindexes, NMPlatform *preserve_in_platform); @@ -198,4 +199,8 @@ void nm_config_clear_warnings(NMConfig *config); /*****************************************************************************/ +gboolean nm_config_kernel_command_line_nm_debug(void); + +/*****************************************************************************/ + #endif /* __NETWORKMANAGER_CONFIG_H__ */ |