daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
572a44
From adc1b71d84ab8b618c623749f43dc6350d75de6b Mon Sep 17 00:00:00 2001
572a44
From: Michal Sekletar <msekleta@redhat.com>
572a44
Date: Tue, 4 Mar 2014 17:00:54 +0100
572a44
Subject: [PATCH] logind: given that we can now relatively safely shutdown
572a44
 sessions copes without working cgroup empty notifications there's no need to
572a44
 set the stop timeout of sessions scopes low
572a44
572a44
Based-on: a50df72b37ce2a7caf7775c70d18c3f9504b9e80
572a44
---
572a44
 src/login/logind-dbus.c | 11 +----------
572a44
 1 file changed, 1 insertion(+), 10 deletions(-)
572a44
572a44
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
572a44
index a68e9b4..6cabb7b 100644
572a44
--- a/src/login/logind-dbus.c
572a44
+++ b/src/login/logind-dbus.c
572a44
@@ -2549,10 +2549,9 @@ int manager_start_scope(
572a44
                 DBusError *error,
572a44
                 char **job) {
572a44
 
572a44
-        const char *timeout_stop_property = "TimeoutStopUSec", *send_sighup_property = "SendSIGHUP", *pids_property = "PIDs", *after_property = "After";
572a44
+        const char *send_sighup_property = "SendSIGHUP", *pids_property = "PIDs", *after_property = "After";
572a44
         _cleanup_dbus_message_unref_ DBusMessage *m = NULL, *reply = NULL;
572a44
         DBusMessageIter iter, sub, sub2, sub3, sub4;
572a44
-        uint64_t timeout = 500 * USEC_PER_MSEC;
572a44
         dbus_bool_t send_sighup = true;
572a44
         const char *fail = "fail";
572a44
         uint32_t u;
572a44
@@ -2632,14 +2631,6 @@ int manager_start_scope(
572a44
          * stop timeout for sessions, so that we don't wait
572a44
          * forever. */
572a44
 
572a44
-        if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||
572a44
-            !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &timeout_stop_property) ||
572a44
-            !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "t", &sub3) ||
572a44
-            !dbus_message_iter_append_basic(&sub3, DBUS_TYPE_UINT64, &timeout) ||
572a44
-            !dbus_message_iter_close_container(&sub2, &sub3) ||
572a44
-            !dbus_message_iter_close_container(&sub, &sub2))
572a44
-                return log_oom();
572a44
-
572a44
         /* Make sure that the session shells are terminated with
572a44
          * SIGHUP since bash and friends tend to ignore SIGTERM */
572a44
         if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||