From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 7 Feb 2014 14:44:10 +0000 (+0100)
Subject: machined: since we can now somewhat reliable get notifications for dying
X-Git-Tag: v209~225
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4e05c4951aaaa57c9c6f3fb91723e7b93b1bbbda

machined: since we can now somewhat reliable get notifications for dying
scopes we don't need to lower the stop timeout anymore
---

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 1087a1bc4..7c7293b29 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -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;