forked from pool/systemd
701179bcff
- Update to new upstream release 221 OBS-URL: https://build.opensuse.org/request/show/313261 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=875
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
---
|
|
units/console-shell.service.m4.in | 2 ++
|
|
units/emergency.service.in | 3 ++-
|
|
units/rescue.service.in | 3 ++-
|
|
3 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
Index: systemd-221/units/console-shell.service.m4.in
|
|
===================================================================
|
|
--- systemd-221.orig/units/console-shell.service.m4.in
|
|
+++ systemd-221/units/console-shell.service.m4.in
|
|
@@ -17,6 +17,8 @@ Before=getty.target
|
|
[Service]
|
|
Environment=HOME=/root
|
|
WorkingDirectory=/root
|
|
+ExecStartPre=-/usr/bin/plymouth quit
|
|
+ExecStartPre=-/usr/bin/plymouth --wait
|
|
ExecStart=-@SULOGIN@
|
|
ExecStopPost=-@SYSTEMCTL@ poweroff
|
|
Type=idle
|
|
Index: systemd-221/units/emergency.service.in
|
|
===================================================================
|
|
--- systemd-221.orig/units/emergency.service.in
|
|
+++ systemd-221/units/emergency.service.in
|
|
@@ -17,7 +17,8 @@ Before=shutdown.target
|
|
[Service]
|
|
Environment=HOME=/root
|
|
WorkingDirectory=/root
|
|
-ExecStartPre=-/bin/plymouth quit
|
|
+ExecStartPre=-/usr/bin/plymouth quit
|
|
+ExecStartPre=-/usr/bin/plymouth --wait
|
|
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
|
|
Index: systemd-221/units/rescue.service.in
|
|
===================================================================
|
|
--- systemd-221.orig/units/rescue.service.in
|
|
+++ systemd-221/units/rescue.service.in
|
|
@@ -16,7 +16,8 @@ Before=shutdown.target
|
|
[Service]
|
|
Environment=HOME=/root
|
|
WorkingDirectory=/root
|
|
-ExecStartPre=-/bin/plymouth quit
|
|
+ExecStartPre=-/usr/bin/plymouth quit
|
|
+ExecStartPre=-/usr/bin/plymouth --wait
|
|
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\\nboot into default mode.'
|
|
ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
|
|
Type=idle
|