summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-08-05 20:29:11 +0200
committerLennart Poettering <lennart@poettering.net>2010-08-05 20:29:11 +0200
commit30609d9c187331640125d6b7e3c650330304b383 (patch)
tree34eecba2f2e87e75d191c0179b406727a9e8fec5 /units
parentd4054675b1eba164cec8a7e104b94ba1a5b069e1 (diff)
units: always send HUP when dealing with shells/gettys/logins
Diffstat (limited to 'units')
-rw-r--r--units/emergency.service4
-rw-r--r--units/fedora/single.service4
-rw-r--r--units/getty@.service.m45
3 files changed, 7 insertions, 6 deletions
diff --git a/units/emergency.service b/units/emergency.service
index 7a1f81a46..dda7e168c 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -20,6 +20,6 @@ Restart=restart-always
RestartSec=0
KillMode=process-group
-# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.
-ExecStop=-/bin/kill -HUP ${MAINPID}
+KillSignal=SIGHUP
diff --git a/units/fedora/single.service b/units/fedora/single.service
index 93a70cf4b..75b8ecc0b 100644
--- a/units/fedora/single.service
+++ b/units/fedora/single.service
@@ -23,6 +23,6 @@ Restart=restart-always
RestartSec=0
KillMode=process-group
-# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.
-ExecStop=-/bin/kill -HUP ${MAINPID}
+KillSignal=SIGHUP
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 19dfe6972..e023a9dcb 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -27,9 +27,10 @@ ExecStart=GETTY %I
Restart=restart-always
RestartSec=0
KillMode=process-group
-m4_ifdef(`TARGET_SUSE',
+
+# Some login implementations ignore SIGTERM, so we send SIGHUP
+# instead, to ensure that login terminates cleanly.
KillSignal=SIGHUP
-)m4_dnl
[Install]
Alias=getty.target.wants/getty@tty1.service getty.target.wants/getty@tty2.service getty.target.wants/getty@tty3.service getty.target.wants/getty@tty4.service getty.target.wants/getty@tty5.service getty.target.wants/getty@tty6.service