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/kernel-install.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/kernel-install.xml')
| -rw-r--r-- | man/kernel-install.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/man/kernel-install.xml b/man/kernel-install.xml index 3612b7d934..178ad1d2bd 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -95,14 +95,20 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <para>The kernel-install plugin <filename>50-depmod.install</filename> runs depmod for the <replaceable>KERNEL-VERSION</replaceable>.</para> - <para>The kernel-install plugin <filename>90-loaderentry.install</filename> copies + <para>The kernel-install plugin + <filename>90-loaderentry.install</filename> copies <replaceable>KERNEL-IMAGE</replaceable> to <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/linux</filename>. - It also creates a boot loader entry according to the boot loader specification in + It also creates a boot loader entry according to the boot + loader specification in <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>. - The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in <filename>/etc/os-release</filename>, - or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset. - If the file <filename>initrd</filename> is found next to the + The title of the entry is the + <replaceable>PRETTY_NAME</replaceable> parameter specified + in <filename>/etc/os-release</filename> or + <filename>/usr/lib/os-release</filename> (if the former is + missing), or "Linux + <replaceable>KERNEL-VERSION</replaceable>", if unset. If + the file <filename>initrd</filename> is found next to the <filename>linux</filename> file, the initrd will be added to the configuration.</para> </listitem> @@ -165,6 +171,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <varlistentry> <term> <filename>/etc/os-release</filename> + <filename>/usr/lib/os-release</filename> </term> <listitem> <para>The content of the file specifies the operating system title <replaceable>PRETTY_NAME</replaceable>.</para> |