diff options
| author | Michael Biebl <biebl@debian.org> | 2010-08-06 02:15:54 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-08-06 02:15:54 +0000 |
| commit | b57a63cd59e840932f12033efab39ef18a7b1149 (patch) | |
| tree | 606ba21956337d1a223f271eaea25885d0d02338 /debian/patches | |
| parent | 73fc1d9cc2f663603bf2ef04e4f32bbf65ac0a75 (diff) | |
* 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.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3716 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/10-dont_require_ifup_for_lo.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/10-dont_require_ifup_for_lo.patch b/debian/patches/10-dont_require_ifup_for_lo.patch new file mode 100644 index 00000000..ffea6ff0 --- /dev/null +++ b/debian/patches/10-dont_require_ifup_for_lo.patch @@ -0,0 +1,30 @@ +commit 7e87d79de6d1eeeb47c8e43fb44962bce9c70664 +Author: Dan Williams <dcbw@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@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 (); + } + + /* diff --git a/debian/patches/series b/debian/patches/series index c40ab33b..1fff2cd6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ # Debian patches for network-manager 02-dbus_access_network_manager.patch +10-dont_require_ifup_for_lo.patch |