From b28842ae67557f503ae097d5101cbe0a93fda39d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 5 Mar 2015 12:25:28 +0100 Subject: 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 Signed-off-by: Karel Zak --- include/pathnames.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/pathnames.h') 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" -- cgit v1.2.3-55-g7522