diff options
author | Karel Zak | 2015-03-05 12:25:28 +0100 |
---|---|---|
committer | Karel Zak | 2015-03-05 12:25:28 +0100 |
commit | b28842ae67557f503ae097d5101cbe0a93fda39d (patch) | |
tree | 696c66e2d69af31ab0e4f1eebbfb7ed47616db9d /term-utils/agetty.8 | |
parent | Merge branch 'logger-fix-rfc5424-timestamp' of https://github.com/rgerhards/u... (diff) | |
download | kernel-qcow2-util-linux-b28842ae67557f503ae097d5101cbe0a93fda39d.tar.gz kernel-qcow2-util-linux-b28842ae67557f503ae097d5101cbe0a93fda39d.tar.xz kernel-qcow2-util-linux-b28842ae67557f503ae097d5101cbe0a93fda39d.zip |
agetty: support /usr/lib/os-release too
http://www.freedesktop.org/software/systemd/man/os-release.html
The file /etc/os-release takes precedence over /usr/lib/os-release.
Applications should check for the former, and exclusively use its data
if it exists, and only fall back to /usr/lib/os-release if it is
missing.
Reported-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'term-utils/agetty.8')
-rw-r--r-- | term-utils/agetty.8 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/term-utils/agetty.8 b/term-utils/agetty.8 index c4b7f13e2..66f1a0389 100644 --- a/term-utils/agetty.8 +++ b/term-utils/agetty.8 @@ -338,8 +338,9 @@ Insert the system name, the name of the operating system. Same as `uname \-s'. See also \\S escape code. .TP S or S{VARIABLE} -Insert the VARIABLE data from \fI/etc/os-release\fP. If the VARIABLE argument -is not specified then use PRETTY_NAME from the file or the system name (see \\s). +Insert the VARIABLE data from \fI/etc/os-release\fP, if the file does not exist +then fallback to \fI/usr/lib/os-release\fP. If the VARIABLE argument is not +specified then use PRETTY_NAME from the file or the system name (see \\s). This escape code allows to keep \fI/etc/issue\fP distribution and release independent. Note that \\S{ANSI_COLOR} is converted to the real terminal escape sequence. @@ -401,7 +402,7 @@ the system status file. .B /etc/issue printed before the login prompt. .TP -.B /etc/os-release +.B /etc/os-release /usr/lib/os-release operating system identification data. .TP .B /dev/console |