summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-08-08 10:24:40 +0200
committerThomas Haller <thaller@redhat.com>2020-08-24 21:10:29 +0200
commitc752c52b767e42e5f3c88496102fe80c0538dfd0 (patch)
tree4023e86bf14d30cd6b77eaa4ff5d3240130549c0
parent935e9a4f926aa1872f03281f0aa5f4edcab6eaba (diff)
downloadNetworkManager-c752c52b767e42e5f3c88496102fe80c0538dfd0.tar.gz
dns: add fixme comment to not block while writing to resolvconf/netconfig
Arguably, a fixme comment isn't useful. It would be better to fix it. On the other hand, nowadays these modes are not very popular and usually not used. If somebody cares, please provide a patch.
-rw-r--r--src/dns/nm-dns-manager.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 407d4282d1..9108911cbb 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -574,6 +574,8 @@ again:
nm_close (fd);
+ /* FIXME: don't write to netconfig synchronously. */
+
/* Wait until the process exits */
if (!nm_utils_kill_child_sync (pid, 0, LOGD_DNS, "netconfig", &status, 1000, 0)) {
errsv = errno;
@@ -751,6 +753,8 @@ dispatch_resolvconf (NMDnsManager *self,
_LOGI ("Writing DNS information to %s", RESOLVCONF_PATH);
+ /* FIXME: don't write to resolvconf synchronously. */
+
cmd = g_strconcat (RESOLVCONF_PATH, " -a ", "NetworkManager", NULL);
if ((f = popen (cmd, "w")) == NULL) {
errsv = errno;