chiark / gitweb /
machined: since we can now somewhat reliable get notifications for dying
authorLennart Poettering <lennart@poettering.net>
Fri, 7 Feb 2014 14:44:10 +0000 (15:44 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 7 Feb 2014 15:18:16 +0000 (16:18 +0100)
scopes we don't need to lower the stop timeout anymore

src/machine/machined-dbus.c

index 1087a1bc4f1552a939dc5b9a2ccd76822fb03b24..7c7293b29de22320b1ddd1aa8812ca0b17ad920c 100644 (file)
@@ -518,14 +518,6 @@ int manager_start_scope(
                         return r;
         }
 
-        /* cgroup empty notification is not available in containers
-         * currently. To make this less problematic, let's shorten the
-         * stop timeout for machines, 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;
-
         r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, pid);
         if (r < 0)
                 return r;