diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-07-09 16:25:00 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-07-10 05:43:52 +0200 |
| commit | ac59f0c12c117b9bb5b7e17f33987b0107791239 (patch) | |
| tree | fc0da293f41fae3f2a2dca4ccc2cf202f5286212 /units/emergency.service.in | |
| parent | Merge pull request #531 from dvdhrm/boot-buildid (diff) | |
| download | systemd-ac59f0c12c117b9bb5b7e17f33987b0107791239.tar.xz systemd-ac59f0c12c117b9bb5b7e17f33987b0107791239.zip | |
units: emergency.service: wait for plymouth to shut down
Merely calling "plymouth quit" isn't sufficient, as plymouth needs some time to
shut down. This needs plymouth --wait (which is a no-op when it's not running).
Fixes invisible emergency shell with plymouth running endlessly.
https://launchpad.net/bugs/1471258
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 52b9b1cd03..8dc3cbdede 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -16,7 +16,7 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=/root -ExecStartPre=-/bin/plymouth quit +ExecStartPre=-/bin/plymouth --wait quit ExecStartPre=-/bin/echo -e 'Welcome to 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 |