[systemd-commits] 2 commits - src/service.c units/emergency.service units/fedora units/getty at .service.m4

[Lennart Poettering]

 src/service.c               |    4 ++++
 units/emergency.service     |    4 ++--
 units/fedora/single.service |    4 ++--
 units/getty at .service.m4     |    5 +++--
 4 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 30609d9c187331640125d6b7e3c650330304b383
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Aug 5 20:29:11 2010 +0200

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

diff --git a/units/emergency.service b/units/emergency.service
index 7a1f81a..dda7e16 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 93a70cf..75b8ecc 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 at .service.m4 b/units/getty at .service.m4
index 19dfe69..e023a9d 100644
--- a/units/getty at .service.m4
+++ b/units/getty at .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 at tty1.service getty.target.wants/getty at tty2.service getty.target.wants/getty at tty3.service getty.target.wants/getty at tty4.service getty.target.wants/getty at tty5.service getty.target.wants/getty at tty6.service
commit d4054675b1eba164cec8a7e104b94ba1a5b069e1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Aug 5 20:28:51 2010 +0200

    service: read special startup dirs only on the respective distros

diff --git a/src/service.c b/src/service.c
index b2e0f86..ee1da2a 100644
--- a/src/service.c
+++ b/src/service.c
@@ -56,11 +56,15 @@ static const struct {
         { "rc4.d",  SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP },
         { "rc5.d",  SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP },
 
+#ifdef TARGET_SUSE
         /* SUSE style boot.d */
         { "boot.d", SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },
+#endif
 
+#ifdef TARGET_DEBIAN
         /* Debian style rcS.d */
         { "rcS.d",  SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },
+#endif
 
         /* Standard SysV runlevels for shutdown */
         { "rc0.d",  SPECIAL_POWEROFF_TARGET,  RUNLEVEL_DOWN },