pool/syslogd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 305543 from Base:System

Browse Source 
- Modernize systemd service units

OBS-URL: https://build.opensuse.org/request/show/305543
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/syslogd?expand=0&rev=84
This commit is contained in:
Stephan Kulow 2015-05-07 07:21:19 +00:00 committed by Git OBS Bridge
commit b693effec7
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
klog.service
View File

@ -17,15 +17,17 @@
[Unit] [Unit]
Description=Early Kernel Boot Messages Description=Early Kernel Boot Messages
Requires=local-fs.target default.target DefaultDependencies=no
Wants=syslog.service Requires=local-fs.target
After=local-fs.target After=local-fs.target
Before=syslog.service default.target Before=shutdown.target
RefuseManualStart=true RefuseManualStart=true
ConditionPathIsDirectory=/var/log ConditionPathIsDirectory=/var/log
[Service] [Service]
Type=oneshot Type=oneshot
StandardError=tty
StandardOutput=tty
RemainAfterExit=yes RemainAfterExit=yes
Environment=KLOGCONSOLE_PARAMS= Environment=KLOGCONSOLE_PARAMS=
EnvironmentFile=-/etc/sysconfig/boot EnvironmentFile=-/etc/sysconfig/boot

11
klogd.service
View File

@ -20,20 +20,19 @@
[Unit] [Unit]
Description=System Kernel Logging Service Description=System Kernel Logging Service
Requisite=syslog.service Requisite=syslogd.service
BindsTo=syslog.service BindsTo=syslogd.service
After=syslog.service After=syslogd.service
RefuseManualStart=true RefuseManualStart=true
[Service] [Service]
Type=forking Type=simple
StandardOutput=syslog StandardOutput=syslog
StandardError=syslog StandardError=syslog
PIDFile=/var/run/klogd.pid
Environment=KERNEL_LOGLEVEL=1 Environment=KERNEL_LOGLEVEL=1
Environment=KLOGD_PARAMS= Environment=KLOGD_PARAMS=
EnvironmentFile=-/etc/sysconfig/syslog EnvironmentFile=-/etc/sysconfig/syslog
ExecStart=/sbin/klogd -c $KERNEL_LOGLEVEL $KLOGD_PARAMS -x ExecStart=/sbin/klogd -n -c $KERNEL_LOGLEVEL $KLOGD_PARAMS -x
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

5
syslogd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 6 08:04:35 UTC 2015 - werner@suse.de
- Modernize systemd service units
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 11 09:08:48 UTC 2015 - werner@suse.de Wed Mar 11 09:08:48 UTC 2015 - werner@suse.de

10
syslogd.service
View File

@ -18,23 +18,19 @@
Description=System Logging Service Description=System Logging Service
Conflicts=syslog-ng.service rsyslog.service Conflicts=syslog-ng.service rsyslog.service
Requires=var-run.mount Requires=var-run.mount
Requires=syslog.target Requires=syslog.socket
Requires=network.target Requires=network.target
Requires=klogd.service Requires=klogd.service
Before=syslog.target
Before=klogd.service Before=klogd.service
After=var-run.mount
After=network.target
[Service] [Service]
Type=forking Type=notify
PIDFile=/var/run/syslogd.pid
Sockets=syslog.socket Sockets=syslog.socket
StandardOutput=null StandardOutput=null
Environment=ADDITIONAL_SOCKET= Environment=ADDITIONAL_SOCKET=
ExecStartPre=/usr/sbin/syslogd-service-prepare ExecStartPre=/usr/sbin/syslogd-service-prepare
EnvironmentFile=-/var/run/syslogd/additional-log-sockets.env EnvironmentFile=-/var/run/syslogd/additional-log-sockets.env
ExecStart=/usr/sbin/syslogd $ADDITIONAL_SOCKET ExecStart=/usr/sbin/syslogd -n $ADDITIONAL_SOCKET
ExecReload=/bin/systemctl kill --signal=TSTP klogd.service ExecReload=/bin/systemctl kill --signal=TSTP klogd.service
ExecReload=/sbin/killproc -p /var/run/syslogd.pid -HUP /usr/sbin/syslogd ExecReload=/sbin/killproc -p /var/run/syslogd.pid -HUP /usr/sbin/syslogd
ExecReload=/bin/systemctl kill --signal=CONT klogd.service ExecReload=/bin/systemctl kill --signal=CONT klogd.service