fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 17:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings/ifupdown: drop unused define ALWAYS_UNMANAGE in plugin

Browse source 
This is only useful for testing. But since the managed flag is configurable
via NetworkManager.conf, there is no point in having a define as well. If
you want to test it, just configure it.

And if you really want to patch the code, then patch
"priv->unmanage_well_known" to be always TRUE.
This commit is contained in:
Thomas Haller 2018-08-25 11:19:10 +02:00
parent fab0d214b7
commit afb9fa6753
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
View file

@ -52,11 +52,6 @@
#define IFUPDOWN_UNMANAGE_WELL_KNOWN_DEFAULT TRUE
/* #define ALWAYS_UNMANAGE TRUE */
#ifndef ALWAYS_UNMANAGE
#define ALWAYS_UNMANAGE FALSE
#endif
/*****************************************************************************/
typedef struct {
@ -180,7 +175,7 @@ udev_device_added (SettingsPluginIfupdown *self, struct udev_device *device)
if (exported)
bind_device_to_connection (self, device, exported);
if (ALWAYS_UNMANAGE || priv->unmanage_well_known)
if (priv->unmanage_well_known)
_nm_settings_plugin_emit_signal_unmanaged_specs_changed (NM_SETTINGS_PLUGIN (self));
}
@ -200,7 +195,7 @@ udev_device_removed (SettingsPluginIfupdown *self, struct udev_device *device)
if (!g_hash_table_remove (priv->kernel_ifaces, iface))
return;
if (ALWAYS_UNMANAGE || priv->unmanage_well_known)
if (priv->unmanage_well_known)
_nm_settings_plugin_emit_signal_unmanaged_specs_changed (NM_SETTINGS_PLUGIN (self));
}
@ -220,7 +215,7 @@ udev_device_changed (SettingsPluginIfupdown *self, struct udev_device *device)
if (!g_hash_table_lookup (priv->kernel_ifaces, iface))
return;
if (ALWAYS_UNMANAGE || priv->unmanage_well_known)
if (priv->unmanage_well_known)
_nm_settings_plugin_emit_signal_unmanaged_specs_changed (NM_SETTINGS_PLUGIN (self));
}
@ -282,7 +277,7 @@ get_unmanaged_specs (NMSettingsPlugin *plugin)
struct udev_device *device;
const char *iface;
if (!ALWAYS_UNMANAGE && !priv->unmanage_well_known)
if (!priv->unmanage_well_known)
return NULL;
_LOGD ("unmanaged-specs: unmanaged devices count %u",