forked from pool/systemd
Marcus Meissner
f35f0221c2
- 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/request/show/280821 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=844
51 lines
2.2 KiB
Diff
51 lines
2.2 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.
|
|
---
|
|
units/console-shell.service.m4.in | 2 +-
|
|
units/emergency.service.in | 2 +-
|
|
units/rescue.service.in | 2 +-
|
|
3 files changed, 3 insertions(+), 3 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,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-218/units/emergency.service.in
|
|
===================================================================
|
|
--- systemd-218.orig/units/emergency.service.in
|
|
+++ systemd-218/units/emergency.service.in
|
|
@@ -18,7 +18,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" or ^D to\\ntry again to boot into default mode.'
|
|
-ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
|
|
+ExecStart=-/bin/sh -c "/usr/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
|
|
Type=idle
|
|
StandardInput=tty-force
|
|
StandardOutput=inherit
|
|
Index: systemd-218/units/rescue.service.in
|
|
===================================================================
|
|
--- systemd-218.orig/units/rescue.service.in
|
|
+++ systemd-218/units/rescue.service.in
|
|
@@ -18,7 +18,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" or ^D to\\nboot into default mode.'
|
|
-ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
|
|
+ExecStart=-/bin/sh -c "/usr/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
|
|
Type=idle
|
|
StandardInput=tty-force
|
|
StandardOutput=inherit
|