diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-06-13 19:45:52 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-06-13 20:11:59 +0200 |
| commit | 5ae4d543cb9b45ad6c6b82b78da1d6abc2291cdb (patch) | |
| tree | cf4d8817660f9a2a828c16ce42392703a5ccd690 /man/systemd-nspawn.xml | |
| parent | b0284aba93e8ccd415da5bbee86d84c12b1b9856 (diff) | |
os-release: define /usr/lib/os-release as fallback for /etc/os-release
The file should have been in /usr/lib/ in the first place, since it
describes the OS container in /usr (and not the configuration in /etc),
hence, let's support os-release files in /usr/lib as fallback if no
version in /etc exists, following the usual override logic.
A prior commit already enabled tmpfiles to create /etc/os-release as a
symlink to /usr/lib/os-release should it be missing, thus providing nice
compatibility with applications only checking in /etc.
While it's probably a good idea if all apps check both locations via a
fallback logic, it is only necessary in the early boot process, as long
as the /etc/os-release symlink has not been restored, in case we boot
with an empty /etc.
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index d6687038af..950558feec 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -136,8 +136,9 @@ <para>As a safety check <command>systemd-nspawn</command> will verify the - existence of <filename>/etc/os-release</filename> in - the container tree before starting the container (see + existence of <filename>/usr/lib/os-release</filename> + or <filename>/etc/os-release</filename> in the + container tree before starting the container (see <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>). It might be necessary to add this file to the container tree manually if the OS of the container is too old to |