Change name of PID file to /var/run/syslog.pid. Since we're replacing

syslogd, it won't matter if we overwrite its PID file.

PR:		18244
Submitted by:	maintainer
This commit is contained in:
Will Andrews 2000-04-29 02:38:55 +00:00
parent d97bb688c9
commit 5a51c60c24
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=28064
2 changed files with 22 additions and 12 deletions

View file

@ -1,11 +1,16 @@
--- src/syslog-ng.h.orig Sat Apr 22 12:19:19 2000 --- src/syslog-ng.h.orig Tue Feb 22 09:50:29 2000
+++ src/syslog-ng.h Sat Apr 22 12:28:52 2000 +++ src/syslog-ng.h Wed Apr 26 17:42:07 2000
@@ -34,7 +34,7 @@ @@ -32,10 +32,10 @@
#if WITH_DEBUG
#define PATH_SYSLOG_NG_CONF "syslog-ng.conf" #define PATH_SYSLOG_NG_CONF "syslog-ng.conf"
#define PATH_PIDFILE "syslog-ng.pid" -#define PATH_PIDFILE "syslog-ng.pid"
+#define PATH_PIDFILE "syslog.pid"
#else #else
-#define PATH_SYSLOG_NG_CONF "/etc/syslog-ng/syslog-ng.conf" -#define PATH_SYSLOG_NG_CONF "/etc/syslog-ng/syslog-ng.conf"
-#define PATH_PIDFILE "/var/run/syslog-ng.pid"
+#define PATH_SYSLOG_NG_CONF "__PREFIX__/etc/syslog-ng/syslog-ng.conf" +#define PATH_SYSLOG_NG_CONF "__PREFIX__/etc/syslog-ng/syslog-ng.conf"
#define PATH_PIDFILE "/var/run/syslog-ng.pid" +#define PATH_PIDFILE "/var/run/syslog.pid"
#endif #endif
#define ST_QUIT 16

View file

@ -1,11 +1,16 @@
--- src/syslog-ng.h.orig Sat Apr 22 12:19:19 2000 --- src/syslog-ng.h.orig Tue Feb 22 09:50:29 2000
+++ src/syslog-ng.h Sat Apr 22 12:28:52 2000 +++ src/syslog-ng.h Wed Apr 26 17:42:07 2000
@@ -34,7 +34,7 @@ @@ -32,10 +32,10 @@
#if WITH_DEBUG
#define PATH_SYSLOG_NG_CONF "syslog-ng.conf" #define PATH_SYSLOG_NG_CONF "syslog-ng.conf"
#define PATH_PIDFILE "syslog-ng.pid" -#define PATH_PIDFILE "syslog-ng.pid"
+#define PATH_PIDFILE "syslog.pid"
#else #else
-#define PATH_SYSLOG_NG_CONF "/etc/syslog-ng/syslog-ng.conf" -#define PATH_SYSLOG_NG_CONF "/etc/syslog-ng/syslog-ng.conf"
-#define PATH_PIDFILE "/var/run/syslog-ng.pid"
+#define PATH_SYSLOG_NG_CONF "__PREFIX__/etc/syslog-ng/syslog-ng.conf" +#define PATH_SYSLOG_NG_CONF "__PREFIX__/etc/syslog-ng/syslog-ng.conf"
#define PATH_PIDFILE "/var/run/syslog-ng.pid" +#define PATH_PIDFILE "/var/run/syslog.pid"
#endif #endif
#define ST_QUIT 16