From: Michal Schmidt <mschmidt@redhat.com>
Date: Tue, 20 Sep 2011 10:11:04 +0000 (+0200)
Subject: units: direct stdout/stderr of rescue shells to tty
X-Git-Tag: v36~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbe8269481a0272a51d72dc35a54a1fe20c93dfc;p=thirdparty%2Fsystemd.git

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 cce2d5a5a44..a4a9108b325 100644
--- 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 eff52618685..4847f4f0c6e 100644
--- 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 d2fd582e86e..5b4ab6efb6a 100644
--- 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