diff options
| author | Riccardo Setti <giskard@autistici.org> | 2006-08-02 17:56:24 +0000 |
|---|---|---|
| committer | Riccardo Setti <giskard@autistici.org> | 2006-08-02 17:56:24 +0000 |
| commit | a449bc5835aeca913c8ccc5e378ec3b06fcdde2f (patch) | |
| tree | d633856e8ab1537af368194b02604ed53cf2184b | |
| parent | 0cf95b63fb5cf6aa9856bd1ad527f4896d76d719 (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
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/08-disabled_devices.patch | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 1265705c..cd7f013b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (closes: #379163) + - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) - -- Riccardo Setti <giskard@autistici.org> Sun, 23 Jul 2006 11:47:10 +0200 + -- Riccardo Setti <giskard@debian.org> Wed, 2 Aug 2006 19:51:48 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 2ac3103d..9f16c586 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: network-manager Section: net Priority: optional -Maintainer: Riccardo Setti <giskard@autistici.org> +Maintainer: Riccardo Setti <giskard@debian.org> Uploaders: Michael Biebl <biebl@teco.edu> Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 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; + } + |