diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-02 12:27:52 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-02 12:27:52 +0100 |
| commit | e671c662ae8c8d58a5f3f8a1e898ebd97dc37b23 (patch) | |
| tree | 5886ad3f4aacddf3636389b3845fbc0eb2d216c4 | |
| parent | 342ff14f24c965df06f3989c874cac1a134d52d6 (diff) | |
| parent | 2f8cd1aba769c536cebdebc26c20b9a6b1b00fad (diff) | |
| download | rsyslog-e671c662ae8c8d58a5f3f8a1e898ebd97dc37b23.tar.gz rsyslog-e671c662ae8c8d58a5f3f8a1e898ebd97dc37b23.tar.xz rsyslog-e671c662ae8c8d58a5f3f8a1e898ebd97dc37b23.zip | |
Merge branch 'v6-stable'
Conflicts:
plugins/imuxsock/imuxsock.c
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 5 | ||||
| -rw-r--r-- | rsyslog.service.in | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 1134d276..b4488ded 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -69,8 +69,11 @@ MODULE_CNFNAME("imuxsock") #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 /* forward definitions */ 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 |