[systemd-commits] units/console-shell.service.m4 units/emergency.service units/rescue.service.m4

[Michal Schmidt]

 units/console-shell.service.m4 |    2 ++
 units/emergency.service        |    2 ++
 units/rescue.service.m4        |    2 ++
 3 files changed, 6 insertions(+)

New commits:
commit cbe8269481a0272a51d72dc35a54a1fe20c93dfc
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Sep 20 12:11:04 2011 +0200

    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 cce2d5a..a4a9108 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 eff5261..4847f4f 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 d2fd582..5b4ab6e 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