From: Tom Gundersen <teg@jklm.no>
Date: Fri, 17 Jan 2014 16:09:56 +0000 (+0100)
Subject: networkd: resolv.conf - reword comment
X-Git-Tag: v209~401
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b2ad8a16eea1d125159fbd71974ea7c24dc0ab0a;ds=sidebyside

networkd: resolv.conf - reword comment

Take into account that users may want to use resolvconf(8), or similar. Also,
avoid repeated calls to fputs().
---

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 27f806aab..8eaf101df 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -334,11 +334,11 @@ int manager_update_resolv_conf(Manager *m) {
 
         fchmod(fileno(f), 0644);
 
-        fputs("# This file is managed by systemd-networkd(8). Do not edit.\n#\n", f);
-        fputs("# Third party programs must not access this file directly, but\n", f);
-        fputs("# only through the symlink at /etc/resolv.conf. To manage your\n", f);
-        fputs("# own static resolv.conf(5), replace the symlink by a static\n", f);
-        fputs("# file at /etc/resolv.conf.\n\n", f);
+        fputs("# This file is managed by systemd-networkd(8). Do not edit.\n#\n"
+              "# Third party programs must not access this file directly, but\n"
+              "# only through the symlink at /etc/resolv.conf. To manage\n"
+              "# resolv.conf(5) in a different way, replace the symlink by a\n"
+              "# static file or a different symlink.\n\n", f);
 
         HASHMAP_FOREACH(link, m->links, i) {
                 if (link->dhcp) {