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

[Zbigniew Jędrzejewski-Szmek]

On Fri, Jan 17, 2014 at 04:18:45PM +0100, Lennart Poettering wrote:
> 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);
And if we're already nitpicking:

debian has "resolv" (or something like that) package, which manages /etc/resolv.conf
by keeping a volatile file in /var/.../resolv.conf, and a symlink to it in /etc/resolv.conf.
It would be nice to change the text to accomodate that too, maybe
"To manage resolv.conf(5) in a different way, replace the /etc/resolv.conf symlink
by a static file or a different symlink. systemd-networkd(8) will create the
/etc/resolv.conf symlink if no symlink or file is present there."

Zbyszek