colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh: emit deprecation warning when a ifcfg-rh profile is found

Browse Source 
Emit a warning (once) when a connection profile is found in ifcfg-rh
format.
This commit is contained in:
Beniamino Galvani
2023-05-31 08:53:38 +02:00
parent 9c90503ffe
commit 3fd70ff685
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
View File

@@ -53,6 +53,7 @@ typedef struct {
GHashTable *unmanaged_specs; GHashTable *unmanaged_specs;
GHashTable *unrecognized_specs; GHashTable *unrecognized_specs;
gboolean warned;
} NMSIfcfgRHPluginPrivate; } NMSIfcfgRHPluginPrivate;
struct _NMSIfcfgRHPlugin { struct _NMSIfcfgRHPlugin {
@@ -177,6 +178,8 @@ nm_assert_self(NMSIfcfgRHPlugin *self, gboolean unhandled_specs_consistent)
static NMSIfcfgRHStorage * static NMSIfcfgRHStorage *
_load_file(NMSIfcfgRHPlugin *self, const char *filename, GError **error) _load_file(NMSIfcfgRHPlugin *self, const char *filename, GError **error)
{ {
NMSIfcfgRHPluginPrivate *priv = NMS_IFCFG_RH_PLUGIN_GET_PRIVATE(self);
NMSIfcfgRHStorage *ret = NULL;
gs_unref_object NMConnection *connection = NULL; gs_unref_object NMConnection *connection = NULL;
gs_free_error GError *load_error = NULL; gs_free_error GError *load_error = NULL;
gs_free char *unhandled_spec = NULL; gs_free char *unhandled_spec = NULL;
@@ -224,16 +227,23 @@ _load_file(NMSIfcfgRHPlugin *self, const char *filename, GError **error)
nm_assert_not_reached(); nm_assert_not_reached();
return NULL; return NULL;
} }
return nms_ifcfg_rh_storage_new_unhandled(self,
ret = nms_ifcfg_rh_storage_new_unhandled(self, filename, unmanaged_spec, unrecognized_spec);
} else {
ret = nms_ifcfg_rh_storage_new_connection(self,
filename, filename,
unmanaged_spec, g_steal_pointer(&connection),
unrecognized_spec); &st.st_mtim);
} }
return nms_ifcfg_rh_storage_new_connection(self, if (!priv->warned) {
filename, nm_log_info(_NMLOG_DOMAIN,
g_steal_pointer(&connection), "Warning: the ifcfg-rh plugin is deprecated, please migrate connections "
&st.st_mtim); "to the keyfile format using \"nmcli connection migrate\".");
priv->warned = TRUE;
}
return ret;
} }
static void static void