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 /include/pathnames.h | |
| 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 'include/pathnames.h')
| -rw-r--r-- | include/pathnames.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/pathnames.h b/include/pathnames.h index 37f010997..e68ac7df2 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -79,7 +79,9 @@ /* used in term-utils/agetty.c */ #define _PATH_ISSUE "/etc/issue" -#define _PATH_OS_RELEASE "/etc/os-release" +#define _PATH_OS_RELEASE_ETC "/etc/os-release" +#define _PATH_OS_RELEASE_USR "/usr/lib/os-release" + #define _PATH_NUMLOCK_ON _PATH_LOCALSTATEDIR "/numlock-on" #define _PATH_LOGINDEFS "/etc/login.defs" |