From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Aug 2010 18:29:11 +0000 (+0200)
Subject: units: always send HUP when dealing with shells/gettys/logins
X-Git-Tag: v6~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30609d9c187331640125d6b7e3c650330304b383;p=systemd

units: always send HUP when dealing with shells/gettys/logins
---

diff --git a/units/emergency.service b/units/emergency.service
index 7a1f81a4..dda7e168 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 93a70cf4..75b8ecc0 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 19dfe697..e023a9dc 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