diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 09:59:38 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 09:59:38 +0100 |
| commit | 4b667744e7fde259a5a895a3b55baeec9139a6f1 (patch) | |
| tree | 2a9de735b15ec4f5e7a24abc51b79652767c63e5 | |
| parent | 3f657f5b056c02cddb17ad639b226f24ebb047c5 (diff) | |
| parent | 906b04e97e8e1f8f09110e6e13caad87862f4736 (diff) | |
| download | rsyslog-4b667744e7fde259a5a895a3b55baeec9139a6f1.tar.gz rsyslog-4b667744e7fde259a5a895a3b55baeec9139a6f1.tar.xz rsyslog-4b667744e7fde259a5a895a3b55baeec9139a6f1.zip | |
Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | rsyslog.service.in | 3 | ||||
| -rw-r--r-- | rsyslog.socket | 8 |
3 files changed, 2 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 9493e373..f699cc46 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,9 +44,6 @@ endif # if HAVE_SYSTEMD -dist_systemdsystemunit_DATA = \ - rsyslog.socket - nodist_systemdsystemunit_DATA = \ rsyslog.service diff --git a/rsyslog.service.in b/rsyslog.service.in index 2bcde528..03db596e 100644 --- a/rsyslog.service.in +++ b/rsyslog.service.in @@ -2,9 +2,10 @@ Description=System Logging Service [Service] +ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service ExecStart=@sbindir@/rsyslogd -n -c5 ExecReload=/bin/kill -HUP $MAINPID +Sockets=syslog.socket [Install] WantedBy=multi-user.target -Also=rsyslog.socket diff --git a/rsyslog.socket b/rsyslog.socket deleted file mode 100644 index 0cd86054..00000000 --- a/rsyslog.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Syslog Socket - -[Socket] -ListenDatagram=/dev/log - -[Install] -WantedBy=sockets.target |