chiark / gitweb /
logind: given that we can now relatively safely shutdown sessions copes
authorLennart Poettering <lennart@poettering.net>
Thu, 6 Feb 2014 18:04:51 +0000 (19:04 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 7 Feb 2014 14:14:36 +0000 (15:14 +0100)
without working cgroup empty notifications there's no need to set the
stop timeout of sessions scopes low

src/login/logind-dbus.c

index 40885557c14a465f9f9d4aa2f0df0f9e98f96f9b..642ba07f2e3b4e436e1e49618255e0f53c3e687a 100644 (file)
@@ -2228,10 +2228,6 @@ int manager_start_scope(
          * stop timeout for sessions, so that we don't wait
          * forever. */
 
          * 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);
         /* 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);