From 0d3159ce3a0ba9d0d7d6daaabd4da6052fbc5784 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sun, 24 Nov 2019 14:25:02 +0100 Subject: [PATCH] app-admin/sysklogd: Revbump to set correct localstatedir path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is required to not make syslogd bail out on startup if /var/lib/run directory does not exist. Reported-by: Holger Hoffstätte Closes: https://bugs.gentoo.org/701048 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Lars Wendler --- app-admin/sysklogd/files/sysklogd.rc8 | 2 +- .../sysklogd/{sysklogd-2.0.ebuild => sysklogd-2.0-r1.ebuild} | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename app-admin/sysklogd/{sysklogd-2.0.ebuild => sysklogd-2.0-r1.ebuild} (87%) diff --git a/app-admin/sysklogd/files/sysklogd.rc8 b/app-admin/sysklogd/files/sysklogd.rc8 index a6590d725a69..920ab9633264 100644 --- a/app-admin/sysklogd/files/sysklogd.rc8 +++ b/app-admin/sysklogd/files/sysklogd.rc8 @@ -34,7 +34,7 @@ start_daemon() { ebegin "sysklogd -> start: ${daemon}" start-stop-daemon --start --exec /usr/sbin/"${daemon}" \ -b -m --pidfile /var/run/"${daemon}".pid \ - -- ${fg_opt} ${options} + -- ${options} ${fg_opt} retval=$? eend ${retval} "Failed to start ${daemon}" diff --git a/app-admin/sysklogd/sysklogd-2.0.ebuild b/app-admin/sysklogd/sysklogd-2.0-r1.ebuild similarity index 87% rename from app-admin/sysklogd/sysklogd-2.0.ebuild rename to app-admin/sysklogd/sysklogd-2.0-r1.ebuild index c69300ca428a..d7a075079882 100644 --- a/app-admin/sysklogd/sysklogd-2.0.ebuild +++ b/app-admin/sysklogd/sysklogd-2.0-r1.ebuild @@ -41,6 +41,11 @@ src_prepare() { src_configure() { local myeconfargs=( + # Required for correct pid file location. (bug #701048) + # syslogd appends "/run/syslogd.pid" to the localstatedir + # path, and tries to write to that file even when being + # started in foreground. So we need to pin this to / + --localstatedir="${EPREFIX}"/ $(use_with klogd) $(use_with logger) $(use_with systemd systemd $(systemd_get_systemunitdir)) -- 2.26.2