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

diff --git a/units/emergency.service b/units/emergency.service
index 7a1f81a468bb77eb602a33d1e4dc5978b2febd9d..dda7e168cb65ec447766b0e1a90bf549c00ddab3 100644 (file)
--- 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 93a70cf4b0fe020a2fe7b078a865fb0a99e97385..75b8ecc0b0e6c5ad939015d725abe4832277a89f 100644 (file)
--- 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 19dfe69722cbdbac1af80e74a46d5a765a8057a8..e023a9dcb74af931ca5143ab8c5d5c27d3bfe9b7 100644 (file)
--- 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