diff options
Diffstat (limited to 'units')
| -rw-r--r-- | units/emergency.service.in | 4 | ||||
| -rw-r--r-- | units/quotaon.service.in | 2 | ||||
| -rw-r--r-- | units/rescue.service.in | 4 | ||||
| -rw-r--r-- | units/serial-getty@.service.m4 | 6 | ||||
| -rw-r--r-- | units/systemd-journal-upload.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-networkd.service.m4.in | 6 | ||||
| -rw-r--r-- | units/systemd-quotacheck.service.in | 2 |
7 files changed, 17 insertions, 8 deletions
diff --git a/units/emergency.service.in b/units/emergency.service.in index da68eb8faa..e9eb238b98 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -17,9 +17,7 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=-/root -ExecStartPre=-/bin/plymouth --wait quit -ExecStartPre=-/bin/echo -e 'You are in emergency mode. After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.' -ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default" +ExecStart=-@rootlibexecdir@/systemd-sulogin-shell emergency Type=idle StandardInput=tty-force StandardOutput=inherit diff --git a/units/quotaon.service.in b/units/quotaon.service.in index 7d59a40195..f3e1e270c9 100644 --- a/units/quotaon.service.in +++ b/units/quotaon.service.in @@ -10,7 +10,7 @@ Description=Enable File System Quotas Documentation=man:quotaon(8) DefaultDependencies=no After=systemd-quotacheck.service -Before=local-fs.target shutdown.target +Before=remote-fs.target shutdown.target ConditionPathExists=@QUOTAON@ [Service] diff --git a/units/rescue.service.in b/units/rescue.service.in index 5feff69c89..4ab66f4856 100644 --- a/units/rescue.service.in +++ b/units/rescue.service.in @@ -16,9 +16,7 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=-/root -ExecStartPre=-/bin/plymouth --wait quit -ExecStartPre=-/bin/echo -e 'You are in rescue mode. After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.' -ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default" +ExecStart=-@rootlibexecdir@/systemd-sulogin-shell rescue Type=idle StandardInput=tty-force StandardOutput=inherit diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 index 4522d0d2be..609c5b62ee 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 @@ -21,6 +21,12 @@ After=rc-local.service Before=getty.target IgnoreOnIsolate=yes +# IgnoreOnIsolate causes issues with sulogin, if someone isolates +# rescue.target or starts rescue.service from multi-user.target or +# graphical.target. +Conflicts=rescue.service +Before=rescue.service + [Service] ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM Type=idle diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in index b9eab21542..d00b929211 100644 --- a/units/systemd-journal-upload.service.in +++ b/units/systemd-journal-upload.service.in @@ -28,6 +28,7 @@ RestrictRealtime=yes RestrictNamespaces=yes RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 SystemCallArchitectures=native +ReadWritePaths=/var/lib/systemd/journal-upload # If there are many split up journal files we need a lot of fds to # access them all and combine diff --git a/units/systemd-networkd.service.m4.in b/units/systemd-networkd.service.m4.in index c3f153046a..5811b00819 100644 --- a/units/systemd-networkd.service.m4.in +++ b/units/systemd-networkd.service.m4.in @@ -42,3 +42,9 @@ ReadWritePaths=/run/systemd [Install] WantedBy=multi-user.target Also=systemd-networkd.socket + +# We want to enable systemd-networkd-wait-online.service whenever this service +# is enabled. systemd-networkd-wait-online.service has +# WantedBy=network-online.target, so enabling it only has an effect if +# network-online.target itself is enabled or pulled in by some other unit. +Also=systemd-networkd-wait-online.service diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in index 5cb9bc3bc9..6b1999aa51 100644 --- a/units/systemd-quotacheck.service.in +++ b/units/systemd-quotacheck.service.in @@ -10,7 +10,7 @@ Description=File System Quota Check Documentation=man:systemd-quotacheck.service(8) DefaultDependencies=no After=systemd-remount-fs.service -Before=local-fs.target shutdown.target +Before=remote-fs.target shutdown.target ConditionPathExists=@QUOTACHECK@ [Service] |