summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-29 23:31:38 +0200
committerLennart Poettering <lennart@poettering.net>2011-03-29 23:31:38 +0200
commitcd25cce98f5cc930202212c3c9c13605c09698b4 (patch)
tree7c186394fed8a04e5ad8fef37eda670282f2a08e /units
parent12235040ec94279ad92693dcfae0a4d9c35a6076 (diff)
exec: drop process group kill mode since it has little use and confuses the user
Diffstat (limited to 'units')
-rw-r--r--units/console-shell.service.m42
-rw-r--r--units/emergency.service2
-rw-r--r--units/getty@.service.m42
-rw-r--r--units/rescue.service.m42
-rw-r--r--units/serial-getty@.service.m42
5 files changed, 5 insertions, 5 deletions
diff --git a/units/console-shell.service.m4 b/units/console-shell.service.m4
index c98a08fccc..cce2d5a5a4 100644
--- a/units/console-shell.service.m4
+++ b/units/console-shell.service.m4
@@ -31,7 +31,7 @@ WorkingDirectory=/root
ExecStart=-/sbin/sulogin
ExecStopPost=-/bin/systemctl poweroff
StandardInput=tty-force
-KillMode=process-group
+KillMode=process
# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.
diff --git a/units/emergency.service b/units/emergency.service
index cb28a78385..a97ec5e389 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -21,7 +21,7 @@ ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^
ExecStart=-/sbin/sulogin
ExecStopPost=/bin/systemctl --fail default
StandardInput=tty-force
-KillMode=process-group
+KillMode=process
# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 1a8a6a0e9c..a9733a60d6 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -36,7 +36,7 @@ ExecStart=-/sbin/agetty %I 38400
Restart=always
RestartSec=0
UtmpIdentifier=%I
-KillMode=process-group
+KillMode=process
# Unset locale for the console getty since the console has problems
# displaying some internationalized messages.
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index 969ac4728f..241c75071f 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -28,7 +28,7 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
`ExecStart=-/sbin/sulogin'))
ExecStopPost=-/bin/systemctl --fail default
StandardInput=tty-force
-KillMode=process-group
+KillMode=process
# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index d42330a1ad..8b4f0fb9d5 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -36,7 +36,7 @@ ExecStart=-/sbin/agetty -s %I 115200,38400,9600
Restart=always
RestartSec=0
UtmpIdentifier=%I
-KillMode=process-group
+KillMode=process
# Some login implementations ignore SIGTERM, so we send SIGHUP
# instead, to ensure that login terminates cleanly.