summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-02-08 15:37:32 +0000
committerMichael Biebl <biebl@debian.org>2010-02-08 15:37:32 +0000
commitd765345df65158e553fda164453cf360a70edb8f (patch)
tree6915a0403d30cfc7201de50874089a8488300228 /debian
parent2900f5299c07a8935b336fe1362dbbb51063b250 (diff)
* debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch
  - Set autoconnect=true for devices marked as allow-hotplug in
    /etc/network/interfaces. (Closes: #568784)

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3509 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch13
-rw-r--r--debian/patches/series2
3 files changed, 17 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0185f15f..8dcdb98b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low
   * debian/patches/04-etc-hosts-rewrite.patch
     - Be more selective when adding hostname to /etc/hosts.
       Patch pulled from upstream Git. (Closes: #567411)
+  * debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch
+    - Set autoconnect=true for devices marked as allow-hotplug in
+      /etc/network/interfaces. (Closes: #568784)
   * debian/control
     - Remove Riccardo from Uploaders with Riccardo's consent.
     - Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no
diff --git a/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch b/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch
new file mode 100644
index 00000000..d27dfe35
--- /dev/null
+++ b/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch
@@ -0,0 +1,13 @@
+Index: NetworkManager-0.7.999/system-settings/plugins/ifupdown/plugin.c
+===================================================================
+--- NetworkManager-0.7.999.orig/system-settings/plugins/ifupdown/plugin.c	2010-02-08 16:07:48.379559508 +0100
++++ NetworkManager-0.7.999/system-settings/plugins/ifupdown/plugin.c	2010-02-08 16:08:04.255557965 +0100
+@@ -355,7 +355,7 @@
+ 	ifparser_init ();
+ 	block = ifparser_getfirst ();
+ 	while (block) {
+-		if(!strcmp ("auto", block->type))
++		if(!strcmp ("auto", block->type) || !strcmp ("allow-hotplug", block->type))
+ 			g_hash_table_insert (auto_ifaces, block->name, GUINT_TO_POINTER (1));
+ 		else if (!strcmp ("iface", block->type) && strcmp ("lo", block->name)) {
+ 			NMIfupdownConnection *exported;
diff --git a/debian/patches/series b/debian/patches/series
index 08786385..f1e83cf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 02-dbus_access_network_manager.patch
 03-hostname-fallback.patch
 04-etc-hosts-rewrite.patch
-#20-manual_means_always_online.patch
+05-ifupdown-allow-hotplug-autoconnect.patch