diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-05 16:10:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-05 16:10:27 +0200 |
| commit | c7e9e2123ee71fb868bbcff59225e009e21af590 (patch) | |
| tree | 12ab52bb20cb34c9fcd36816e836a1959440d5fc /tools | |
| parent | 304ab88dd64b2ae46554fa5394aa8822194b1e95 (diff) | |
| parent | b5afa1a5be2909ed13f77ef0e0804bab75325198 (diff) | |
| download | rsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.tar.gz rsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.tar.xz rsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
runtime/rsyslog.h
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/syslogd.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 96657ad4..6541194a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,7 +36,7 @@ rsyslogd_SOURCES = \ \ ../dirty.h rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) -rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) +rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) -lm rsyslogd_LDFLAGS = -export-dynamic if ENABLE_DIAGTOOLS diff --git a/tools/syslogd.c b/tools/syslogd.c index 3a6ba20f..53da16d8 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2432,10 +2432,9 @@ doGlblProcessInit(void) for (i = 3; i < num_fds; i++) (void) close(i); untty(); - } - else - { - fputs(" Already running.\n", stderr); + } else { + fputs(" Already running. If you want to run multiple instances, you need " + "to specify different pid files (use -i option)\n", stderr); exit(1); /* "good" exit, done if syslogd is already running */ } } |