forked from pool/systemd
51b7daad78
- Update use-usr-sbin-sulogin-for-emergency-service.patch to apply to all services using sulogin and remove generated files from upstream tarball (bnc#841398). OBS-URL: https://build.opensuse.org/request/show/201156 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=445
45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
From: Andrey Borzenkov <arvidjaar@gmail.com>
|
|
Subject: use /usr/sbin/sulogin in emergency service
|
|
|
|
In current Factory sulogin is in /usr/sbin which makes it impossible
|
|
to enter emergency service.
|
|
Index: systemd-207/units/emergency.service.in
|
|
===================================================================
|
|
--- systemd-207.orig/units/emergency.service.in
|
|
+++ systemd-207/units/emergency.service.in
|
|
@@ -17,7 +17,7 @@ Environment=HOME=/root
|
|
WorkingDirectory=/root
|
|
ExecStartPre=-/bin/plymouth 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" to try again\\nto boot into default mode.'
|
|
-ExecStart=-/sbin/sulogin
|
|
+ExecStart=-/usr/sbin/sulogin
|
|
ExecStopPost=@SYSTEMCTL@ --fail --no-block default
|
|
Type=idle
|
|
StandardInput=tty-force
|
|
Index: systemd-207/units/console-shell.service.m4.in
|
|
===================================================================
|
|
--- systemd-207.orig/units/console-shell.service.m4.in
|
|
+++ systemd-207/units/console-shell.service.m4.in
|
|
@@ -17,7 +17,7 @@ Before=getty.target
|
|
[Service]
|
|
Environment=HOME=/root
|
|
WorkingDirectory=/root
|
|
-ExecStart=-/sbin/sulogin
|
|
+ExecStart=-/usr/sbin/sulogin
|
|
ExecStopPost=-@SYSTEMCTL@ poweroff
|
|
Type=idle
|
|
StandardInput=tty-force
|
|
Index: systemd-207/units/rescue.service.m4.in
|
|
===================================================================
|
|
--- systemd-207.orig/units/rescue.service.m4.in
|
|
+++ systemd-207/units/rescue.service.m4.in
|
|
@@ -18,7 +18,7 @@ Environment=HOME=/root
|
|
WorkingDirectory=/root
|
|
ExecStartPre=-/bin/plymouth quit
|
|
ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
|
|
-ExecStart=-/sbin/sulogin
|
|
+ExecStart=-/usr/sbin/sulogin
|
|
ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
|
|
Type=idle
|
|
StandardInput=tty-force
|