[systemd-devel] [systemd-commits] 7 commits - man/systemd-networkd.service.xml src/libsystemd src/network src/systemd units/systemd-networkd.service.in

Lennart Poettering lennart at poettering.net
Fri Jan 17 07:18:45 PST 2014


On Thu, 16.01.14 11:32, Tom Gundersen (tomegun at kemper.freedesktop.org) wrote:

> 
> diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
> index 3b54214..27f806a 100644
> --- a/src/network/networkd-manager.c
> +++ b/src/network/networkd-manager.c
> @@ -334,7 +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", f);
> +        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);

Just some nitpicking: why do this with 5 function calls instead of just
one? i.e.

This is so much nicer:

    fputs("foo\n"
          "bar\n", f);

than this:

    fputs("foo\n", f);
    fputs("bar\n", f);

I believe...

It's faster, it's simpler, it's less visual clutter...

Lennart

-- 
Lennart Poettering, Red Hat


More information about the systemd-devel mailing list