diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-06-18 19:47:44 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-06-18 19:47:44 +0200 |
| commit | 12b42c76672a66c2d4ea7212c14f8f1b5a62b78d (patch) | |
| tree | 0a9f5aff7fc2f144765f936c618c563568edba1f /man/standard-conf.xml | |
| parent | 74b1f5276365bbdf02dacec707fb9c40509650b4 (diff) | |
| download | systemd-12b42c76672a66c2d4ea7212c14f8f1b5a62b78d.tar.gz | |
man: revert dynamic paths for split-usr setups
This did not really work out as we had hoped. Trying to do this upstream
introduced several problems that probably makes it better suited as a
downstream patch after all. At any rate, it is not releaseable in the
current state, so we at least need to revert this before the release.
* by adjusting the path to binaries, but not do the same thing to the
search path we end up with inconsistent man-pages. Adjusting the search
path too would be quite messy, and it is not at all obvious that this is
worth the effort, but at any rate it would have to be done before we
could ship this.
* this means that distributed man-pages does not make sense as they depend
on config options, and for better or worse we are still distributing
man pages, so that is something that definitely needs sorting out before
we could ship with this patch.
* we have long held that split-usr is only minimally supported in order
to boot, and something we hope will eventually go away. So before we start
adding even more magic/effort in order to make this work nicely, we should
probably question if it makes sense at all.
Diffstat (limited to 'man/standard-conf.xml')
| -rw-r--r-- | man/standard-conf.xml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/man/standard-conf.xml b/man/standard-conf.xml index 123877a0a5..004f53f70c 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <refsection> <refsection id='confd'> @@ -42,14 +39,14 @@ <para>Default configuration is defined during compilation, so a configuration file is only needed when it is necessary to deviate from those defaults. By default the configuration file in - <filename>&pkgsysconfdir;/</filename> contains commented out entries + <filename>/etc/systemd/</filename> contains commented out entries showing the defaults as a guide to the administrator. This file can be edited to create local overrides. </para> <para>When packages need to customize the configuration, they can install configuration snippets in - <filename>&rootlibexecdir;/*.conf.d/</filename>. Files in + <filename>/usr/lib/systemd/*.conf.d/</filename>. Files in <filename>/etc/</filename> are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages. The main |