about summary refs log tree commit diff
path: root/debian/patches
diff options
context:
space:
mode:
authorRiccardo Setti <giskard@autistici.org>2006-08-02 17:56:24 +0000
committerRiccardo Setti <giskard@autistici.org>2006-08-02 17:56:24 +0000
commita449bc5835aeca913c8ccc5e378ec3b06fcdde2f (patch)
treed633856e8ab1537af368194b02604ed53cf2184b /debian/patches
parent0cf95b63fb5cf6aa9856bd1ad527f4896d76d719 (diff)
- allow "auto-hotplug" iface to be managed by NM. (closes: #381017)
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@910 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/08-disabled_devices.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch
index d5392c9f..37e2d727 100644
--- a/debian/patches/08-disabled_devices.patch
+++ b/debian/patches/08-disabled_devices.patch
@@ -29,17 +29,17 @@
 +	 * definitely not okay to control it.
 +	 */
 +	for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) {
-+		if (!strcmp (curr_b->type, "auto")
++		if (!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug")
 +		    && strstr (curr_b->name, iface))
 +			blacklist = FALSE;
 +	}
 +
 +	/* If the interface has no options other than just "inet dhcp"
-+	 * it's probably ok to fiddle with it.
++	 * it's probably ok to fiddle with it. 
 +	 */
 +	for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) {
 +		if (strcmp (curr_d->key, "inet")
-+		    || strcmp (curr_d->data, "dhcp"))
++		    || strcmp (curr_d->data, "dhcp" )|| strcmp ( currd->key, "iface"))
 +			blacklist = TRUE;
 +	}
 +