diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
| commit | 04996460fa839109b6318838d1f41e5f3ef8139a (patch) | |
| tree | cb35e54363b8ea8e78e6978a92fb68ae9409e116 /src/nm-config.h | |
| parent | 1ae6f6dc1b3c266401a4709995991b967320139a (diff) | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'src/nm-config.h')
| -rw-r--r-- | src/nm-config.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/nm-config.h b/src/nm-config.h index 9930df33..283d6a1b 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -62,6 +62,7 @@ #define NM_CONFIG_KEYFILE_KEY_MAIN_AUTH_POLKIT "auth-polkit" #define NM_CONFIG_KEYFILE_KEY_MAIN_DHCP "dhcp" #define NM_CONFIG_KEYFILE_KEY_MAIN_DEBUG "debug" +#define NM_CONFIG_KEYFILE_KEY_MAIN_HOSTNAME_MODE "hostname-mode" #define NM_CONFIG_KEYFILE_KEY_LOGGING_BACKEND "backend" #define NM_CONFIG_KEYFILE_KEY_CONFIG_ENABLE "enable" #define NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS ".was" @@ -74,6 +75,7 @@ #define NM_CONFIG_KEYFILE_KEY_AUDIT "audit" #define NM_CONFIG_KEYFILE_KEY_DEVICE_IGNORE_CARRIER "ignore-carrier" +#define NM_CONFIG_KEYFILE_KEY_DEVICE_SRIOV_NUM_VFS "sriov-num-vfs" #define NM_CONFIG_KEYFILE_KEYPREFIX_WAS ".was." #define NM_CONFIG_KEYFILE_KEYPREFIX_SET ".set." @@ -123,13 +125,15 @@ const char *nm_config_get_log_domains (NMConfig *config); gboolean nm_config_get_configure_and_quit (NMConfig *config); gboolean nm_config_get_is_debug (NMConfig *config); +gboolean nm_config_get_first_start (NMConfig *config); + void nm_config_set_values (NMConfig *self, GKeyFile *keyfile_intern_new, gboolean allow_write, gboolean force_rewrite); /* for main.c only */ -NMConfigCmdLineOptions *nm_config_cmd_line_options_new (void); +NMConfigCmdLineOptions *nm_config_cmd_line_options_new (gboolean first_start); void nm_config_cmd_line_options_free (NMConfigCmdLineOptions *cli); void nm_config_cmd_line_options_add_to_entries (NMConfigCmdLineOptions *cli, GOptionContext *opt_ctx); @@ -202,14 +206,12 @@ struct _NMConfigDeviceStateData { const char *perm_hw_addr_fake; }; -NMConfigDeviceStateData *nm_config_device_state_load (NMConfig *self, - int ifindex); -gboolean nm_config_device_state_write (NMConfig *self, - int ifindex, - gboolean managed, +NMConfigDeviceStateData *nm_config_device_state_load (int ifindex); +gboolean nm_config_device_state_write (int ifindex, + NMConfigDeviceStateManagedType managed, const char *perm_hw_addr_fake, const char *connection_uuid); -void nm_config_device_state_prune_unseen (NMConfig *self, GHashTable *seen_ifindexes); +void nm_config_device_state_prune_unseen (GHashTable *seen_ifindexes); /*****************************************************************************/ |