summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-11-24 14:25:02 +0100
committerLars Wendler <polynomial-c@gentoo.org>2019-11-24 14:25:33 +0100
commit0d3159ce3a0ba9d0d7d6daaabd4da6052fbc5784 (patch)
treef90a8c6588f20ef60067ea7edb89599f1eb97391
parentmedia-plugins/imlib2_loaders: wrap longdescription properly (diff)
downloadgentoo-0d3159ce3a0ba9d0d7d6daaabd4da6052fbc5784.tar.gz
gentoo-0d3159ce3a0ba9d0d7d6daaabd4da6052fbc5784.tar.bz2
gentoo-0d3159ce3a0ba9d0d7d6daaabd4da6052fbc5784.zip
app-admin/sysklogd: Revbump to set correct localstatedir path
This is required to not make syslogd bail out on startup if /var/lib/run directory does not exist. Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com> Closes: https://bugs.gentoo.org/701048 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-rw-r--r--app-admin/sysklogd/files/sysklogd.rc82
-rw-r--r--app-admin/sysklogd/sysklogd-2.0-r1.ebuild (renamed from app-admin/sysklogd/sysklogd-2.0.ebuild)5
2 files changed, 6 insertions, 1 deletions
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
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))