diff options
| author | Michael Biebl <biebl@debian.org> | 2010-12-04 17:00:19 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-12-04 17:09:31 +0100 |
| commit | 5e827aae48d2335c847f3029e0c9bdbd846924ca (patch) | |
| tree | 5a8bb1b5a83c414cb22fe8e401ba573dac6aee62 | |
| parent | 262012122f6fdb67f1645c009beb5f8c477e5868 (diff) | |
Do not require a valid connection for devices to be marked unmanaged.
* debian/patches/40-umanaged-interfaces.patch
- For devices to be marked unmanaged, do not require a valid connection
configuration. (Closes: #569215)
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/40-umanaged-interfaces.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 37 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 11dbc923..3afda83f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.8.1-6) UNRELEASED; urgency=low + + * debian/patches/40-umanaged-interfaces.patch + - For devices to be marked unmanaged, do not require a valid connection + configuration. (Closes: #569215) + + -- Michael Biebl <biebl@debian.org> Thu, 02 Dec 2010 01:47:35 +0100 + network-manager (0.8.1-5) unstable; urgency=low * Update Vcs-* fields: Move packaging from svn to git. diff --git a/debian/patches/40-umanaged-interfaces.patch b/debian/patches/40-umanaged-interfaces.patch new file mode 100644 index 00000000..b5509fc5 --- /dev/null +++ b/debian/patches/40-umanaged-interfaces.patch @@ -0,0 +1,28 @@ +Index: network-manager/system-settings/plugins/ifupdown/plugin.c +=================================================================== +--- network-manager.orig/system-settings/plugins/ifupdown/plugin.c 2010-12-03 20:47:40.656731988 +0100 ++++ network-manager/system-settings/plugins/ifupdown/plugin.c 2010-12-04 16:41:38.258906974 +0100 +@@ -366,6 +366,7 @@ + /* Remove any connection for this block that was previously found */ + exported = g_hash_table_lookup (priv->iface_connections, block->name); + if (exported) { ++ PLUGIN_PRINT("SCPlugin-Ifupdown", "deleting %s from iface_connections", block->name); + nm_settings_connection_interface_delete (NM_SETTINGS_CONNECTION_INTERFACE (exported), + ignore_cb, + NULL); +@@ -375,11 +376,14 @@ + /* add the new connection */ + exported = nm_ifupdown_connection_new (block); + if (exported) { ++ PLUGIN_PRINT("SCPlugin-Ifupdown", "adding %s to iface_connections", block->name); + g_hash_table_insert (priv->iface_connections, block->name, exported); +- g_hash_table_insert (priv->well_known_interfaces, block->name, "known"); + } ++ PLUGIN_PRINT("SCPlugin-Ifupdown", "adding iface %s to well_known_interfaces", block->name); ++ g_hash_table_insert (priv->well_known_interfaces, block->name, "known"); + } else if (!strcmp ("mapping", block->type)) { + g_hash_table_insert (priv->well_known_interfaces, block->name, "known"); ++ PLUGIN_PRINT("SCPlugin-Ifupdown", "adding mapping %s to well_known_interfaces", block->name); + } + block = block->next; + } diff --git a/debian/patches/series b/debian/patches/series index 365331c3..cdd5044b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 02-dbus_access_network_manager.patch 10-dont_require_ifup_for_lo.patch 30-typo_fix.patch +40-umanaged-interfaces.patch |