[systemd-devel] [PATCH] List configuration dirs in order of a preference

[Michal Vyskocil]

On Fri, Jan 25, 2013 at 11:21:35AM +0100, Peter Sztanojev wrote:
> On Fri, Jan 25, 2013 at 11:14 AM, Michal Vyskocil <mvyskocil at suse.cz> wrote:
> > It makes an order of a preference more clear without a need to read the
> > CONFIGURATION FORMAT section.
> > ---
> >  man/binfmt.d.xml       |    2 +-
> >  man/modules-load.d.xml |    2 +-
> >  man/sysctl.d.xml       |    2 +-
> >  man/systemd.preset.xml |    4 ++--
> >  man/tmpfiles.d.xml     |    2 +-
> >  5 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
> > index 07ae0ac..f27a89a 100644
> > --- a/man/binfmt.d.xml
> > +++ b/man/binfmt.d.xml
> > @@ -47,8 +47,8 @@
> >          </refnamediv>
> >
> >          <refsynopsisdiv>
> > -                <para><filename>/etc/binfmt.d/*.conf</filename></para>
> >                  <para><filename>/run/binfmt.d/*.conf</filename></para>
> > +                <para><filename>/etc/binfmt.d/*.conf</filename></para>
> >                  <para><filename>/usr/lib/binfmt.d/*.conf</filename></para>
> >          </refsynopsisdiv>
> >
> > diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
> > index bcc4d12..263855a 100644
> > --- a/man/modules-load.d.xml
> > +++ b/man/modules-load.d.xml
> > @@ -46,8 +46,8 @@
> >          </refnamediv>
> >
> >          <refsynopsisdiv>
> > -                <para><filename>/etc/modules-load.d/*.conf</filename></para>
> >                  <para><filename>/run/modules-load.d/*.conf</filename></para>
> > +                <para><filename>/etc/modules-load.d/*.conf</filename></para>
> >                  <para><filename>/usr/lib/modules-load.d/*.conf</filename></para>
> >          </refsynopsisdiv>
> >
> > diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
> > index 69aac8c..438d79f 100644
> > --- a/man/sysctl.d.xml
> > +++ b/man/sysctl.d.xml
> > @@ -46,8 +46,8 @@
> >          </refnamediv>
> >
> >          <refsynopsisdiv>
> > -                <para><filename>/etc/sysctl.d/*.conf</filename></para>
> >                  <para><filename>/run/sysctl.d/*.conf</filename></para>
> > +                <para><filename>/etc/sysctl.d/*.conf</filename></para>
> >                  <para><filename>/usr/lib/sysctl.d/*.conf</filename></para>
> >          </refsynopsisdiv>
> >
> > diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
> > index a692053..53742a8 100644
> > --- a/man/systemd.preset.xml
> > +++ b/man/systemd.preset.xml
> > @@ -46,11 +46,11 @@
> >          </refnamediv>
> >
> >          <refsynopsisdiv>
> > -                <para><filename>/etc/systemd/system-preset/*.preset</filename></para>
> >                  <para><filename>/run/systemd/system-preset/*.preset</filename></para>
> > +                <para><filename>/etc/systemd/system-preset/*.preset</filename></para>
> >                  <para><filename>/usr/lib/systemd/system-preset/*.preset</filename></para>
> > -                <para><filename>/etc/systemd/user-preset/*.preset</filename></para>
> >                  <para><filename>/run/systemd/user-preset/*.preset</filename></para>
> > +                <para><filename>/etc/systemd/user-preset/*.preset</filename></para>
> >                  <para><filename>/usr/lib/systemd/user-preset/*.preset</filename></para>
> >          </refsynopsisdiv>
> >
> > diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
> > index 785264e..1e9af5e 100644
> > --- a/man/tmpfiles.d.xml
> > +++ b/man/tmpfiles.d.xml
> > @@ -47,8 +47,8 @@
> >          </refnamediv>
> >
> >          <refsynopsisdiv>
> > -                <para><filename>/etc/tmpfiles.d/*.conf</filename></para>
> >                  <para><filename>/run/tmpfiles.d/*.conf</filename></para>
> > +                <para><filename>/etc/tmpfiles.d/*.conf</filename></para>
> >                  <para><filename>/usr/lib/tmpfiles.d/*.conf</filename></para>
> >          </refsynopsisdiv>
> >
> > --
> > 1.7.10.4
> >
> 
> the order is actually what is documented, see for example
> http://cgit.freedesktop.org/systemd/systemd/tree/src/modules-load/modules-load.c#n201
> 
> maybe it's miss-documented somewhere?

Yeah, my bad - my quite old installed man pages says

Files in /run override files with the same name in /etc/ and /usr/lib/.

but I did not checked properly about the state of a code and a recent
documentation.

Regards
Mchal Vyskocil

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/systemd-devel/attachments/20130125/3606013c/attachment.pgp>