From 04f8869de31597b7b83b4ca96904dfde6526816b Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Fri, 18 Aug 2017 15:00:44 +0200 Subject: [PATCH] Prep v235: Use the new ELOGIND_PID_FILE macro consistently --- src/login/elogind.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/login/elogind.c b/src/login/elogind.c index 43c9e3d9e..73e2a52b3 100644 --- a/src/login/elogind.c +++ b/src/login/elogind.c @@ -34,8 +34,9 @@ #define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024) -#define ELOGIND_PID_FILE "/run/elogind.pid" - +#ifndef ELOGIND_PID_FILE +# define ELOGIND_PID_FILE "/run/elogind.pid" +#endif // ELOGIND_PID_FILE static void remove_pid_file(void) { if (access(ELOGIND_PID_FILE, F_OK) == 0) @@ -99,7 +100,8 @@ int elogind_daemonize(void) { WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_VERIFY_ON_FAILURE); if (r < 0) - log_error_errno(-r, "Failed to write PID file /run/elogind.pid: %m"); + log_error_errno(-r, "Failed to write PID file %s: %m", + ELOGIND_PID_FILE); /* Make sure the PID file gets cleaned up on exit! */ atexit(remove_pid_file); -- 2.30.2