[Pkg-utopia-commits] r3716 - in /packages/unstable/networkmanager/debian: changelog patches/10-dont_require_ifup_for_lo.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Aug  6 02:15:54 2010
New Revision: 3716

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3716
Log:
* debian/patches/10-dont_require_ifup_for_lo.patch
  - Don't require ifup for enabling the loopback interface but use it if
    installed. Patch cherry-picked from upstream Git.

Added:
    packages/unstable/networkmanager/debian/patches/10-dont_require_ifup_for_lo.patch
Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/patches/series

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=3716&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Fri Aug  6 02:15:54 2010
@@ -6,6 +6,9 @@
   * debian/network-manager.postrm
     - Don't fail on purge if /var/lib/NetworkManager directory does not exist.
       (Closes: #591861)
+  * debian/patches/10-dont_require_ifup_for_lo.patch
+    - Don't require ifup for enabling the loopback interface but use it if
+      installed. Patch cherry-picked from upstream Git.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 30 Jul 2010 01:53:34 +0200
 

Added: packages/unstable/networkmanager/debian/patches/10-dont_require_ifup_for_lo.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/10-dont_require_ifup_for_lo.patch?rev=3716&op=file
==============================================================================
--- packages/unstable/networkmanager/debian/patches/10-dont_require_ifup_for_lo.patch (added)
+++ packages/unstable/networkmanager/debian/patches/10-dont_require_ifup_for_lo.patch Fri Aug  6 02:15:54 2010
@@ -1,0 +1,30 @@
+commit 7e87d79de6d1eeeb47c8e43fb44962bce9c70664
+Author: Dan Williams <dcbw at redhat.com>
+Date:   Tue Aug 3 11:36:59 2010 -0700
+
+    debian: don't require ifup for enabling loopback (bgo #625427)
+    
+    But use it if it's installed.
+
+diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
+index ef9475a..37eb645 100644
+--- a/src/backends/NetworkManagerDebian.c
++++ b/src/backends/NetworkManagerDebian.c
+@@ -1,3 +1,4 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+ /* NetworkManager -- Network link manager
+  *
+  * Matthew Garrett <mjg59 at srcf.ucam.org>
+@@ -44,7 +45,11 @@
+  */
+ void nm_system_enable_loopback (void)
+ {
+-	nm_spawn_process ("/sbin/ifup lo");
++	/* ifupdown isn't always installed (bgo #625427) */
++	if (g_file_test ("/sbin/ifup", G_FILE_TEST_EXISTS))
++		nm_spawn_process ("/sbin/ifup lo");
++	else
++		nm_generic_enable_loopback ();
+ }
+ 
+ /*

Modified: packages/unstable/networkmanager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/series?rev=3716&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/patches/series (original)
+++ packages/unstable/networkmanager/debian/patches/series Fri Aug  6 02:15:54 2010
@@ -1,2 +1,3 @@
 # Debian patches for network-manager
 02-dbus_access_network_manager.patch
+10-dont_require_ifup_for_lo.patch