From a0ef58e3e421909661c615ee6b067a9c2cd9f955 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Tue, 4 Mar 2014 17:00:54 +0100 Subject: [PATCH] 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 Based-on: a50df72b37ce2a7caf7775c70d18c3f9504b9e80 --- src/login/logind-dbus.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index c1c3d7f..e1f0c9a 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2548,10 +2548,9 @@ int manager_start_scope( DBusError *error, char **job) { - const char *timeout_stop_property = "TimeoutStopUSec", *send_sighup_property = "SendSIGHUP", *pids_property = "PIDs", *after_property = "After"; + const char *send_sighup_property = "SendSIGHUP", *pids_property = "PIDs", *after_property = "After"; _cleanup_dbus_message_unref_ DBusMessage *m = NULL, *reply = NULL; DBusMessageIter iter, sub, sub2, sub3, sub4; - uint64_t timeout = 500 * USEC_PER_MSEC; dbus_bool_t send_sighup = true; const char *fail = "fail"; uint32_t u; @@ -2631,14 +2630,6 @@ int manager_start_scope( * stop timeout for sessions, so that we don't wait * forever. */ - if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) || - !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &timeout_stop_property) || - !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "t", &sub3) || - !dbus_message_iter_append_basic(&sub3, DBUS_TYPE_UINT64, &timeout) || - !dbus_message_iter_close_container(&sub2, &sub3) || - !dbus_message_iter_close_container(&sub, &sub2)) - return log_oom(); - /* Make sure that the session shells are terminated with * SIGHUP since bash and friends tend to ignore SIGTERM */ if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||