units: direct stdout/stderr of rescue shells to tty

With output of services going to syslog by default now, the rescue shell
units need to direct their output to tty explicitly.
Specify stderr too, just in case.

diff --git a/units/console-shell.service.m4 b/units/console-shell.service.m4
index cce2d5a5a44e95e9bb45b2fecff852626544005d..a4a9108b325099b90e66d92e05a7a81f353599f4 100644 (file)
--- a/units/console-shell.service.m4
+++ b/units/console-shell.service.m4
@@ -31,6 +31,8 @@ WorkingDirectory=/root
 ExecStart=-/sbin/sulogin
 ExecStopPost=-/bin/systemctl poweroff
 StandardInput=tty-force
+StandardOutput=inherit
+StandardError=inherit
 KillMode=process
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash

diff --git a/units/emergency.service b/units/emergency.service
index eff5261868566a08cc9af23260882dca2f42718f..4847f4f0c6ef243c878fa6e635cb8976911becf3 100644 (file)
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -21,6 +21,8 @@ ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^
 ExecStart=-/sbin/sulogin
 ExecStopPost=/bin/systemctl --fail --no-block default
 StandardInput=tty-force
+StandardOutput=inherit
+StandardError=inherit
 KillMode=process
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash

diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index d2fd582e86e69a7203e46e3ead9a90589d91100d..5b4ab6efb6aa252698deb3ffffbe29de201c1a4e 100644 (file)
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -31,6 +31,8 @@ m4_ifdef(`TARGET_MEEGO',
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',)))
 ExecStopPost=-/bin/systemctl --fail --no-block default
 StandardInput=tty-force
+StandardOutput=inherit
+StandardError=inherit
 KillMode=process
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash