diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-08 11:47:56 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-08 11:47:56 +0100 |
| commit | 3a3b32a9f636b2b5a16c43afe2f741abb6ed77bd (patch) | |
| tree | 0c8ee012f4e685af784de82210e44bb319d56975 | |
| parent | 76859612614e3d4428e948e70820566382906805 (diff) | |
| download | NetworkManager-3a3b32a9f636b2b5a16c43afe2f741abb6ed77bd.tar.gz | |
config: add defines for key names for keyfile
| -rw-r--r-- | src/nm-config.h | 2 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/plugin.c | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/nm-config.h b/src/nm-config.h index 7ea65d397e..048bd63748 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -66,6 +66,8 @@ G_BEGIN_DECLS #define NM_CONFIG_KEYFILE_KEY_CONFIG_ENABLE "enable" #define NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS ".was" #define NM_CONFIG_KEYFILE_KEY_KEYFILE_PATH "path" +#define NM_CONFIG_KEYFILE_KEY_KEYFILE_UNMANAGED_DEVICES "unmanaged-devices" +#define NM_CONFIG_KEYFILE_KEY_KEYFILE_HOSTNAME "hostname" #define NM_CONFIG_KEYFILE_KEY_IFNET_AUTO_REFRESH "auto_refresh" #define NM_CONFIG_KEYFILE_KEY_IFNET_MANAGED "managed" #define NM_CONFIG_KEYFILE_KEY_IFUPDOWN_MANAGED "managed" diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index 1ecce71a35..fe7e64a7c3 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -319,8 +319,8 @@ config_changed_cb (NMConfig *config, { gs_free char *old_value = NULL, *new_value = NULL; - old_value = nm_config_data_get_value (old_data, NM_CONFIG_KEYFILE_GROUP_KEYFILE, "unmanaged-devices", NM_CONFIG_GET_VALUE_TYPE_SPEC); - new_value = nm_config_data_get_value (config_data, NM_CONFIG_KEYFILE_GROUP_KEYFILE, "unmanaged-devices", NM_CONFIG_GET_VALUE_TYPE_SPEC); + old_value = nm_config_data_get_value (old_data, NM_CONFIG_KEYFILE_GROUP_KEYFILE, NM_CONFIG_KEYFILE_KEY_KEYFILE_UNMANAGED_DEVICES, NM_CONFIG_GET_VALUE_TYPE_SPEC); + new_value = nm_config_data_get_value (config_data, NM_CONFIG_KEYFILE_GROUP_KEYFILE, NM_CONFIG_KEYFILE_KEY_KEYFILE_UNMANAGED_DEVICES, NM_CONFIG_GET_VALUE_TYPE_SPEC); if (g_strcmp0 (old_value, new_value) != 0) g_signal_emit_by_name (self, NM_SETTINGS_PLUGIN_UNMANAGED_SPECS_CHANGED); @@ -522,7 +522,10 @@ get_unmanaged_specs (NMSettingsPlugin *config) SettingsPluginKeyfilePrivate *priv = SETTINGS_PLUGIN_KEYFILE_GET_PRIVATE (config); gs_free char *value = NULL; - value = nm_config_data_get_value (nm_config_get_data (priv->config), NM_CONFIG_KEYFILE_GROUP_KEYFILE, "unmanaged-devices", NM_CONFIG_GET_VALUE_TYPE_SPEC); + value = nm_config_data_get_value (nm_config_get_data (priv->config), + NM_CONFIG_KEYFILE_GROUP_KEYFILE, + NM_CONFIG_KEYFILE_KEY_KEYFILE_UNMANAGED_DEVICES, + NM_CONFIG_GET_VALUE_TYPE_SPEC); return nm_match_spec_split (value); } @@ -574,7 +577,8 @@ constructed (GObject *object) priv->config = g_object_ref (nm_config_get ()); if (nm_config_data_has_value (nm_config_get_data_orig (priv->config), - NM_CONFIG_KEYFILE_GROUP_KEYFILE, "hostname", + NM_CONFIG_KEYFILE_GROUP_KEYFILE, + NM_CONFIG_KEYFILE_KEY_KEYFILE_HOSTNAME, NM_CONFIG_GET_VALUE_RAW)) nm_log_warn (LOGD_SETTINGS, "keyfile: 'hostname' option is deprecated and has no effect"); } |