diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-02 12:06:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-02 12:06:30 +0100 |
| commit | 2f8cd1aba769c536cebdebc26c20b9a6b1b00fad (patch) | |
| tree | b56ce5184be8f48ce856bfd5cd3993a072a8ba81 | |
| parent | 0bdeeb3c540a0e8e2946119163f9c2a3e0de9cfd (diff) | |
| parent | 536c9370f0773d25ee7a85aa44a10d07bc5e1420 (diff) | |
| download | rsyslog-2f8cd1aba769c536cebdebc26c20b9a6b1b00fad.tar.gz rsyslog-2f8cd1aba769c536cebdebc26c20b9a6b1b00fad.tar.xz rsyslog-2f8cd1aba769c536cebdebc26c20b9a6b1b00fad.zip | |
Merge branch 'v5-stable' into v6-stable
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 7 | ||||
| -rw-r--r-- | rsyslog.service.in | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 36e6a4d8..9eeaaf5d 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -67,8 +67,11 @@ MODULE_TYPE_NOKEEP #define _PATH_LOG "/dev/log" #endif #endif +#ifndef SYSTEMD_JOURNAL +#define SYSTEMD_JOURNAL "/run/systemd/journal" +#endif #ifndef SYSTEMD_PATH_LOG -#define SYSTEMD_PATH_LOG "/run/systemd/journal/syslog" +#define SYSTEMD_PATH_LOG SYSTEMD_JOURNAL "/syslog" #endif /* emulate struct ucred for platforms that do not have it */ @@ -780,7 +783,7 @@ CODESTARTwillRun listeners[0].sockName = pLogSockName; else if(sd_booted()) { struct stat st; - if(stat(SYSTEMD_PATH_LOG, &st) != -1 && S_ISSOCK(st.st_mode)) { + if(stat(SYSTEMD_JOURNAL, &st) != -1 && S_ISDIR(st.st_mode)) { listeners[0].sockName = SYSTEMD_PATH_LOG; } } diff --git a/rsyslog.service.in b/rsyslog.service.in index 23234cde..a5d53ad2 100644 --- a/rsyslog.service.in +++ b/rsyslog.service.in @@ -9,3 +9,4 @@ StandardOutput=null [Install] WantedBy=multi-user.target +Alias=syslog.service |