systemd/plymouth-quit-and-wait-for-emergency-service.patch
Marcus Meissner 5715649b6b - Update to new upstream release 218
I really want networkd with a functioning machinectl --network-veth (broken in 13.2).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=844
2015-02-13 09:43:21 +00:00

48 lines
2.1 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-218/units/console-shell.service.m4.in
===================================================================
--- systemd-218.orig/units/console-shell.service.m4.in
+++ systemd-218/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=-/usr/sbin/sulogin
ExecStopPost=-@SYSTEMCTL@ poweroff
Type=idle
Index: systemd-218/units/emergency.service.in
===================================================================
--- systemd-218.orig/units/emergency.service.in
+++ systemd-218/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 "/usr/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
Type=idle
Index: systemd-218/units/rescue.service.in
===================================================================
--- systemd-218.orig/units/rescue.service.in
+++ systemd-218/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 "/usr/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
Type=idle