diff options
| author | Daniel Molkentin <daniel@molkentin.de> | 2017-03-17 12:13:19 +0100 |
|---|---|---|
| committer | Martin Pitt <martinpitt@users.noreply.github.com> | 2017-03-17 12:13:19 +0100 |
| commit | 7e3ba389191dbc241e05f4d134460bbb832ed60c (patch) | |
| tree | 2f89dcf7fcc40713b7d31b54ae46651522aeecbd /units/emergency.service.in | |
| parent | Merge (¾ of) pull request #5596 from matijaskala/master (diff) | |
| download | systemd-7e3ba389191dbc241e05f4d134460bbb832ed60c.tar.xz systemd-7e3ba389191dbc241e05f4d134460bbb832ed60c.zip | |
units: do not throw a warning in emergency mode if plymouth is not installed (#5528)
Ideally, plymouth should only be referenced via dependencies,
not ExecStartPre's. This at least avoids the confusing error message
on minimal installations that do not carry plymouth.
Diffstat (limited to 'units/emergency.service.in')
| -rw-r--r-- | units/emergency.service.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/units/emergency.service.in b/units/emergency.service.in index da68eb8faa..9f60931a9f 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -17,7 +17,7 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=-/root -ExecStartPre=-/bin/plymouth --wait quit +ExecStartPre=-/bin/sh -c "[ -x /bin/plymouth ] && /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" Type=idle |