diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2011-09-20 12:11:04 +0200 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2011-09-20 12:15:48 +0200 |
| commit | cbe8269481a0272a51d72dc35a54a1fe20c93dfc (patch) | |
| tree | 26feb829dce4d52aae65e8c4220e7f401f33abc9 /units | |
| parent | d6bca18e28268485619127024fd944b8497798a7 (diff) | |
| download | systemd-cbe8269481a0272a51d72dc35a54a1fe20c93dfc.tar.gz | |
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.
Diffstat (limited to 'units')
| -rw-r--r-- | units/console-shell.service.m4 | 2 | ||||
| -rw-r--r-- | units/emergency.service | 2 | ||||
| -rw-r--r-- | units/rescue.service.m4 | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/units/console-shell.service.m4 b/units/console-shell.service.m4 index cce2d5a5a4..a4a9108b32 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 eff5261868..4847f4f0c6 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 d2fd582e86..5b4ab6efb6 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 |