|
 |
4f94566 |
From 1a6dce07f96e63891db22c10acf5b0edc5c4dc81 Mon Sep 17 00:00:00 2001
|
|
|
4f94566 |
From: Michal Sekletar <msekleta@redhat.com>
|
|
|
4f94566 |
Date: Mon, 3 Mar 2014 16:07:39 +0100
|
|
|
4f94566 |
Subject: [PATCH] logind: order all scopes after both systemd-logind.service
|
|
|
4f94566 |
and systemd-user-sessions.service
|
|
|
4f94566 |
|
|
|
4f94566 |
This way at shutdown we can be sure that the sessions go away before the
|
|
|
4f94566 |
network.
|
|
|
4f94566 |
|
|
|
4f94566 |
Based-on: ba4c5d93b73ef7bba0ae0c6bf2b36a42360f7a34
|
|
|
4f94566 |
---
|
|
|
4f94566 |
src/login/logind-dbus.c | 17 ++++++++++++++---
|
|
|
4f94566 |
src/login/logind-session.c | 2 +-
|
|
|
4f94566 |
src/login/logind.h | 2 +-
|
|
|
4f94566 |
3 files changed, 16 insertions(+), 5 deletions(-)
|
|
|
4f94566 |
|
|
|
4f94566 |
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
|
|
|
1cc3df3 |
index 63f0d3c7a3..c1c3d7fd40 100644
|
|
|
4f94566 |
--- a/src/login/logind-dbus.c
|
|
|
4f94566 |
+++ b/src/login/logind-dbus.c
|
|
|
4f94566 |
@@ -2544,10 +2544,11 @@ int manager_start_scope(
|
|
|
4f94566 |
const char *slice,
|
|
|
4f94566 |
const char *description,
|
|
|
4f94566 |
const char *after,
|
|
|
4f94566 |
+ const char *after2,
|
|
|
4f94566 |
DBusError *error,
|
|
|
4f94566 |
char **job) {
|
|
|
4f94566 |
|
|
|
4f94566 |
- const char *timeout_stop_property = "TimeoutStopUSec", *send_sighup_property = "SendSIGHUP", *pids_property = "PIDs";
|
|
|
4f94566 |
+ const char *timeout_stop_property = "TimeoutStopUSec", *send_sighup_property = "SendSIGHUP", *pids_property = "PIDs", *after_property = "After";
|
|
|
4f94566 |
_cleanup_dbus_message_unref_ DBusMessage *m = NULL, *reply = NULL;
|
|
|
4f94566 |
DBusMessageIter iter, sub, sub2, sub3, sub4;
|
|
|
4f94566 |
uint64_t timeout = 500 * USEC_PER_MSEC;
|
|
|
4f94566 |
@@ -2602,8 +2603,6 @@ int manager_start_scope(
|
|
|
4f94566 |
}
|
|
|
4f94566 |
|
|
|
4f94566 |
if (!isempty(after)) {
|
|
|
4f94566 |
- const char *after_property = "After";
|
|
|
4f94566 |
-
|
|
|
4f94566 |
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||
|
|
|
4f94566 |
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &after_property) ||
|
|
|
4f94566 |
!dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "as", &sub3) ||
|
|
|
4f94566 |
@@ -2615,6 +2614,18 @@ int manager_start_scope(
|
|
|
4f94566 |
return log_oom();
|
|
|
4f94566 |
}
|
|
|
4f94566 |
|
|
|
4f94566 |
+ if (!isempty(after2)) {
|
|
|
4f94566 |
+ if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||
|
|
|
4f94566 |
+ !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &after_property) ||
|
|
|
4f94566 |
+ !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, "as", &sub3) ||
|
|
|
4f94566 |
+ !dbus_message_iter_open_container(&sub3, DBUS_TYPE_ARRAY, "s", &sub4) ||
|
|
|
4f94566 |
+ !dbus_message_iter_append_basic(&sub4, DBUS_TYPE_STRING, &after2) ||
|
|
|
4f94566 |
+ !dbus_message_iter_close_container(&sub3, &sub4) ||
|
|
|
4f94566 |
+ !dbus_message_iter_close_container(&sub2, &sub3) ||
|
|
|
4f94566 |
+ !dbus_message_iter_close_container(&sub, &sub2))
|
|
|
4f94566 |
+ return log_oom();
|
|
|
4f94566 |
+ }
|
|
|
4f94566 |
+
|
|
|
4f94566 |
/* cgroup empty notification is not available in containers
|
|
|
4f94566 |
* currently. To make this less problematic, let's shorten the
|
|
|
4f94566 |
* stop timeout for sessions, so that we don't wait
|
|
|
4f94566 |
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
|
|
|
1cc3df3 |
index 78e6d74cda..2bac0a2392 100644
|
|
|
4f94566 |
--- a/src/login/logind-session.c
|
|
|
4f94566 |
+++ b/src/login/logind-session.c
|
|
|
4f94566 |
@@ -518,7 +518,7 @@ static int session_start_scope(Session *s) {
|
|
|
4f94566 |
if (!scope)
|
|
|
4f94566 |
return log_oom();
|
|
|
4f94566 |
|
|
|
4f94566 |
- r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", &error, &job;;
|
|
|
4f94566 |
+ r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-session.service", &error, &job;;
|
|
|
4f94566 |
if (r < 0) {
|
|
|
4f94566 |
log_error("Failed to start session scope %s: %s %s",
|
|
|
4f94566 |
scope, bus_error(&error, r), error.name);
|
|
|
4f94566 |
diff --git a/src/login/logind.h b/src/login/logind.h
|
|
|
1cc3df3 |
index 0d2248fa53..540572f164 100644
|
|
|
4f94566 |
--- a/src/login/logind.h
|
|
|
4f94566 |
+++ b/src/login/logind.h
|
|
|
4f94566 |
@@ -184,7 +184,7 @@ int manager_send_changed(Manager *manager, const char *properties);
|
|
|
4f94566 |
|
|
|
4f94566 |
int manager_dispatch_delayed(Manager *manager);
|
|
|
4f94566 |
|
|
|
4f94566 |
-int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, DBusError *error, char **job);
|
|
|
4f94566 |
+int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, DBusError *error, char **job);
|
|
|
4f94566 |
int manager_start_unit(Manager *manager, const char *unit, DBusError *error, char **job);
|
|
|
4f94566 |
int manager_stop_unit(Manager *manager, const char *unit, DBusError *error, char **job);
|
|
|
4f94566 |
int manager_abandon_scope(Manager *manager, const char *scope, DBusError *error);
|