diff options
Diffstat (limited to 'units')
| -rw-r--r-- | units/fedora/rc-local.service | 7 | ||||
| -rw-r--r-- | units/quotacheck.service.in | 1 | ||||
| -rw-r--r-- | units/quotaon.service | 1 | ||||
| -rw-r--r-- | units/remount-rootfs.service | 1 | ||||
| -rw-r--r-- | units/suse/rc-local.service | 5 | ||||
| -rw-r--r-- | units/syslog.socket | 1 | ||||
| -rw-r--r-- | units/systemd-logind.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-remount-api-vfs.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-shutdownd.socket | 1 | ||||
| -rw-r--r-- | units/systemd-vconsole-setup.service.in | 1 |
10 files changed, 9 insertions, 11 deletions
diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service index f5f940f7ee..0bef5c72ab 100644 --- a/units/fedora/rc-local.service +++ b/units/fedora/rc-local.service @@ -5,14 +5,15 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +# This unit gets pulled automatically into multi-user.target by +# systemd-rc-local-generator if /etc/rc.d/rc.local is executable. [Unit] -Description=/etc/rc.local Compatibility -ConditionFileIsExecutable=/etc/rc.d/rc.local +Description=/etc/rc.d/rc.local Compatibility +After=network.target [Service] Type=forking ExecStart=/etc/rc.d/rc.local start TimeoutSec=0 -StandardOutput=tty RemainAfterExit=yes SysVStartPriority=99 diff --git a/units/quotacheck.service.in b/units/quotacheck.service.in index 27dcb1e4c6..c97b7a4687 100644 --- a/units/quotacheck.service.in +++ b/units/quotacheck.service.in @@ -16,5 +16,4 @@ ConditionPathExists=/sbin/quotacheck Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-quotacheck -StandardOutput=syslog TimeoutSec=0 diff --git a/units/quotaon.service b/units/quotaon.service index 2c7b36b4fe..ef2fc8c976 100644 --- a/units/quotaon.service +++ b/units/quotaon.service @@ -16,4 +16,3 @@ ConditionPathExists=/sbin/quotaon Type=oneshot RemainAfterExit=yes ExecStart=/sbin/quotaon -aug -StandardOutput=syslog diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service index 89a16c8b26..7b63752c7e 100644 --- a/units/remount-rootfs.service +++ b/units/remount-rootfs.service @@ -17,4 +17,3 @@ Wants=local-fs-pre.target Type=oneshot RemainAfterExit=yes ExecStart=/bin/mount / -o remount -StandardOutput=syslog diff --git a/units/suse/rc-local.service b/units/suse/rc-local.service index fe4c00716e..2384a18f94 100644 --- a/units/suse/rc-local.service +++ b/units/suse/rc-local.service @@ -5,14 +5,15 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +# This unit gets pulled automatically into multi-user.target by +# systemd-rc-local-generator if /etc/init.d/boot.local is executable. [Unit] Description=/etc/init.d/boot.local Compatibility -ConditionFileIsExecutable=/etc/init.d/boot.local +After=network.target [Service] Type=oneshot ExecStart=/etc/init.d/boot.local TimeoutSec=0 -StandardOutput=tty RemainAfterExit=yes SysVStartPriority=99 diff --git a/units/syslog.socket b/units/syslog.socket index ca3d95ea35..f9e3171522 100644 --- a/units/syslog.socket +++ b/units/syslog.socket @@ -18,6 +18,7 @@ Wants=syslog.target [Socket] ListenDatagram=/run/systemd/syslog SocketMode=0666 +PassCred=yes # The service we activate on incoming traffic is # systemd-kmsg-syslogd.service. That doesn't mean however, that this diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in index 4241b8b320..c332039e87 100644 --- a/units/systemd-logind.service.in +++ b/units/systemd-logind.service.in @@ -15,7 +15,6 @@ ExecStart=@rootlibexecdir@/systemd-logind Type=dbus BusName=org.freedesktop.login1 CapabilityBoundingSet=CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER -StandardOutput=syslog # Increase the default a bit in order to allow many simultaneous # logins since we keep one fd open per session. diff --git a/units/systemd-remount-api-vfs.service.in b/units/systemd-remount-api-vfs.service.in index 6339ee64a6..f4df0ca263 100644 --- a/units/systemd-remount-api-vfs.service.in +++ b/units/systemd-remount-api-vfs.service.in @@ -17,4 +17,3 @@ Wants=local-fs-pre.target Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-remount-api-vfs -StandardOutput=syslog diff --git a/units/systemd-shutdownd.socket b/units/systemd-shutdownd.socket index bc0358a346..13b6c7a5cc 100644 --- a/units/systemd-shutdownd.socket +++ b/units/systemd-shutdownd.socket @@ -15,3 +15,4 @@ Before=sockets.target [Socket] ListenDatagram=/run/systemd/shutdownd SocketMode=0600 +PassCred=yes diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in index 91d95d66e3..673fb6ccf6 100644 --- a/units/systemd-vconsole-setup.service.in +++ b/units/systemd-vconsole-setup.service.in @@ -16,4 +16,3 @@ Before=sysinit.target shutdown.target Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-vconsole-setup -StandardOutput=syslog |