From ec6d303caaa7bc03ca4328026820d193a150af01 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 7 May 2015 03:48:14 +0200 Subject: Fix fallback paths when writing resolv.conf Closes: #784587 --- debian/changelog | 6 +++++ ...x-falling-back-in-the-resolv.conf-methods.patch | 30 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch diff --git a/debian/changelog b/debian/changelog index 091fbf09..525d0aa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.0.2-2) UNRELEASED; urgency=medium + + * Fix fallback paths when writing resolv.conf. (Closes: #784587) + + -- Michael Biebl Thu, 07 May 2015 03:47:35 +0200 + network-manager (1.0.2-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch b/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch new file mode 100644 index 00000000..b354c189 --- /dev/null +++ b/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch @@ -0,0 +1,30 @@ +From: "Jan Alexander Steffens (heftig)" +Date: Wed, 6 May 2015 20:49:57 +0200 +Subject: dns: Fix falling back in the resolv.conf methods + +--- + src/dns-manager/nm-dns-manager.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c +index 2f8ceab..eade2a0 100644 +--- a/src/dns-manager/nm-dns-manager.c ++++ b/src/dns-manager/nm-dns-manager.c +@@ -782,13 +782,16 @@ update_dns (NMDnsManager *self, + + #ifdef NETCONFIG_PATH + if (success == FALSE) { ++ g_clear_error (error); + success = dispatch_netconfig (searches, nameservers, + nis_domain, nis_servers, error); + } + #endif + +- if (success == FALSE) ++ if (success == FALSE) { ++ g_clear_error (error); + success = update_resolv_conf (searches, nameservers, error); ++ } + + /* signal that resolv.conf was changed */ + if (success) diff --git a/debian/patches/series b/debian/patches/series index 1a072f1d..dd5e2c73 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Don-t-block-network.target-on-NetworkManager-wait-on.patch Fix-iscsiadm-path.patch +dns-Fix-falling-back-in-the-resolv.conf-methods.patch -- cgit 1.3.0-6-gf8a5