diff options
| author | Michael Biebl <biebl@debian.org> | 2014-06-09 20:59:38 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-06-09 21:15:42 +0200 |
| commit | 5a7a520e9f58f5b7f691365a1513a2198b0cccbc (patch) | |
| tree | dc5fbfc9f203dfe195de7ec248719d25d1ef6427 | |
| parent | 6d73e27a6e36e709a9d41a1c8878caff17ab55a6 (diff) | |
| download | rsyslog-5a7a520e9f58f5b7f691365a1513a2198b0cccbc.tar.gz | |
Fix pidfile location
The pidfile should be stored in /var/run, not /etc.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/0002-Fix-pidfile-location.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5553206..852f07d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ rsyslog (8.2.2-1) UNRELEASED; urgency=medium much more efficient RainerScript "call" statement. * Remove the rsyslog-doc package which is now built from a separate source package. + * Fix pidfile location. The pidfile should be stored in /var/run, not /etc. -- Michael Biebl <biebl@debian.org> Thu, 03 Apr 2014 03:08:04 +0200 diff --git a/debian/patches/0002-Fix-pidfile-location.patch b/debian/patches/0002-Fix-pidfile-location.patch new file mode 100644 index 0000000..d7c4a0b --- /dev/null +++ b/debian/patches/0002-Fix-pidfile-location.patch @@ -0,0 +1,29 @@ +From: Michael Biebl <biebl@debian.org> +Date: Mon, 9 Jun 2014 19:11:33 +0200 +Subject: Fix pidfile location + +https://github.com/rsyslog/rsyslog/issues/86 +--- + tools/syslogd.c | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/tools/syslogd.c b/tools/syslogd.c +index ec0beb7..857512b 100644 +--- a/tools/syslogd.c ++++ b/tools/syslogd.c +@@ -134,13 +134,8 @@ void rsyslogdDebugSwitch(); + void rsyslogdDoDie(int sig); + + +-#if defined(SYSLOGD_PIDNAME) +-# undef _PATH_LOGPID +-# define _PATH_LOGPID "/etc/" SYSLOGD_PIDNAME +-#else +-# ifndef _PATH_LOGPID +-# define _PATH_LOGPID "/etc/rsyslogd.pid" +-# endif ++#ifndef _PATH_LOGPID ++# define _PATH_LOGPID "/var/run/rsyslogd.pid" + #endif + + #ifndef _PATH_TTY diff --git a/debian/patches/series b/debian/patches/series index a8e093a..d09b668 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Don-t-create-a-database.patch +0002-Fix-pidfile-location.patch |