+2008-11-25 Dan Williams <dcbw@redhat.com>
+
+ * system-settings/plugins/ifcfg-rh
+ - Rename 'ifcfg-fedora' to 'ifcfg-rh'; it's not just used on Fedora
+
+ * system-settings/src/main.c
+ - (load_plugins): transparently handle ifcfg-fedora as ifcfg-rh
+
2008-11-25 Dan Williams <dcbw@redhat.com>
Patch from Tambet Ingo <tambet@gmail.com>
system-settings/src/Makefile
system-settings/plugins/Makefile
system-settings/plugins/ifupdown/Makefile
-system-settings/plugins/ifcfg-fedora/Makefile
+system-settings/plugins/ifcfg-rh/Makefile
system-settings/plugins/ifcfg-suse/Makefile
system-settings/plugins/keyfile/Makefile
test/Makefile
-pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg-fedora.la
+pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg-rh.la
-libnm_settings_plugin_ifcfg_fedora_la_SOURCES = \
+libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
shvar.c \
shvar.h \
plugin.c \
reader.h \
common.h
-libnm_settings_plugin_ifcfg_fedora_la_CPPFLAGS = \
+libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
-I$(top_builddir)/marshallers \
-DSYSCONFDIR=\"$(sysconfdir)\"
-libnm_settings_plugin_ifcfg_fedora_la_LDFLAGS = -module -avoid-version
-libnm_settings_plugin_ifcfg_fedora_la_LIBADD = \
+libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
+libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/marshallers/libmarshallers.la
if NO_GIO
-libnm_settings_plugin_ifcfg_fedora_la_LIBADD += \
+libnm_settings_plugin_ifcfg_rh_la_LIBADD += \
$(top_builddir)/gfilemonitor/libgfilemonitor.la
else
-libnm_settings_plugin_ifcfg_fedora_la_LIBADD += \
+libnm_settings_plugin_ifcfg_rh_la_LIBADD += \
$(GIO_LIBS)
endif
{
GSList *list = NULL;
char **plist;
- char **pname;
+ char **iter;
plist = g_strsplit (plugins, ",", 0);
if (!plist)
return FALSE;
- for (pname = plist; *pname; pname++) {
+ for (iter = plist; *iter; iter++) {
GModule *plugin;
- char *full_name;
- char *path;
+ char *full_name, *path;
+ const char *pname = *iter;
GObject *obj;
GObject * (*factory_func) (void);
- obj = find_plugin (list, *pname);
+ /* ifcfg-fedora was renamed ifcfg-rh; handle old configs here */
+ if (!strcmp (pname, "ifcfg-fedora"))
+ pname = "ifcfg-rh";
+
+ obj = find_plugin (list, pname);
if (obj)
continue;
- full_name = g_strdup_printf ("nm-settings-plugin-%s", *pname);
+ full_name = g_strdup_printf ("nm-settings-plugin-%s", pname);
path = g_module_build_path (PLUGINDIR, full_name);
plugin = g_module_open (path, G_MODULE_BIND_LOCAL);
if (!plugin) {
g_set_error (error, plugins_error_quark (), 0,
"Could not load plugin '%s': %s",
- *pname, g_module_error ());
+ pname, g_module_error ());
g_free (full_name);
g_free (path);
break;
if (!g_module_symbol (plugin, "nm_system_config_factory", (gpointer) (&factory_func))) {
g_set_error (error, plugins_error_quark (), 0,
"Could not find plugin '%s' factory function.",
- *pname);
+ pname);
break;
}
if (!obj || !NM_IS_SYSTEM_CONFIG_INTERFACE (obj)) {
g_set_error (error, plugins_error_quark (), 0,
"Plugin '%s' returned invalid system config object.",
- *pname);
+ pname);
break;
}