From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 6 Feb 2014 18:04:51 +0000 (+0100)
Subject: logind: given that we can now relatively safely shutdown sessions copes
X-Git-Tag: v209~230
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a50df72b37ce2a7caf7775c70d18c3f9504b9e80;ds=sidebyside

logind: given that we can now relatively safely shutdown sessions copes
without working cgroup empty notifications there's no need to set the
stop timeout of sessions scopes low
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 40885557c..642ba07f2 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2228,10 +2228,6 @@ int manager_start_scope(
          * stop timeout for sessions, so that we don't wait
          * forever. */
 
-        r = sd_bus_message_append(m, "(sv)", "TimeoutStopUSec", "t", 500 * USEC_PER_MSEC);
-        if (r < 0)
-                return r;
-
         /* Make sure that the session shells are terminated with
          * SIGHUP since bash and friends tend to ignore SIGTERM */
         r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", true);