Control: tags -1 = confirmed > On Thu, 07 May 2015 02:30:16 +0200 Michael Biebl <bi...@debian.org> wrote: >> Am 07.05.2015 um 01:55 schrieb Michael Biebl: >> > Am 07.05.2015 um 01:32 schrieb Andrea Capriotti:
>> >> # grep resolvconf /var/log/syslog >> >> May 7 01:16:15 nb-capriotti NetworkManager[13437]: <warn> could > not commit DNS changes: /sbin/resolvconf is not executable >> >> >> >> I fixed it installing resolvconf. >> > >> NM should fallback to non-resolvconf mode, if the resolvconf binary was >> not found during runtime. Actually, the faulty commit is ba593c9d9d2492e221e759fa5d54f2a04adf81d2 The attached patch should fix the issue. Will poke upstream for a review and upload tomorrow. I think we need to clear the GError before passing it on to dispatch_netconfig() and update_resolv_conf(). Otherwise we might return an error even if update_resolv_conf() was successful. Then again, I don't quite see the point in setting error in dispatch_resolvconf() and dispatch_netconfig() in the first place. Maybe Dan can comment on this. Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 21d1603..48b293e 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)
signature.asc
Description: OpenPGP digital signature
