shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

logind-session: downgrade user@.service dep to Wants=

Browse Source 
This partially reverts 52bcc872b5.

We explicitly support running without user manager,
hence only user-runtime-dir@.service should be
required.

Fixes #33405

(cherry picked from commit 26f78eff69)
This commit is contained in:
Mike Yuan 2024-08-17 18:34:46 +02:00 committed by Daan De Meyer
parent 8d7eef9ee5
commit 0ce6df4a6b
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/login/logind-dbus.c
View File

@ -4264,6 +4264,7 @@ int manager_start_scope(
const char *slice,
const char *description,
const char * const *requires,
const char * const *wants,
const char * const *extra_after,
const char *requires_mounts_for,
sd_bus_message *more_properties,
@ -4313,6 +4314,16 @@ int manager_start_scope(
return r;
}
STRV_FOREACH(i, wants) {
r = sd_bus_message_append(m, "(sv)", "Wants", "as", 1, *i);
if (r < 0)
return r;
r = sd_bus_message_append(m, "(sv)", "After", "as", 1, *i);
if (r < 0)
return r;
}
STRV_FOREACH(i, extra_after) {
r = sd_bus_message_append(m, "(sv)", "After", "as", 1, *i);
if (r < 0)
@ -4375,6 +4386,7 @@ int manager_start_scope(
slice,
description,
requires,
wants,
extra_after,
requires_mounts_for,
more_properties,

1
src/login/logind-dbus.h
View File

@ -32,6 +32,7 @@ int manager_start_scope(
const char *slice,
const char *description,
const char * const *requires,
const char * const *wants,
const char * const *extra_after,
const char *requires_mounts_for,
sd_bus_message *more_properties,

8
src/login/logind-session.c
View File

@ -746,15 +746,15 @@ static int session_start_scope(Session *s, sd_bus_message *properties, sd_bus_er
s->user->slice,
description,
/* These should have been pulled in explicitly in user_start(). Just to be sure. */
STRV_MAKE_CONST(s->user->runtime_dir_unit,
SESSION_CLASS_WANTS_SERVICE_MANAGER(s->class) ? s->user->service_manager_unit : NULL),
/* requires = */ STRV_MAKE_CONST(s->user->runtime_dir_unit),
/* wants = */ STRV_MAKE_CONST(SESSION_CLASS_WANTS_SERVICE_MANAGER(s->class) ? s->user->service_manager_unit : NULL),
/* We usually want to order session scopes after systemd-user-sessions.service
* since the unit is used as login session barrier for unprivileged users. However
* the barrier doesn't apply for root as sysadmin should always be able to log in
* (and without waiting for any timeout to expire) in case something goes wrong
* during the boot process. */
STRV_MAKE_CONST("systemd-logind.service",
SESSION_CLASS_IS_EARLY(s->class) ? NULL : "systemd-user-sessions.service"),
/* extra_after = */ STRV_MAKE_CONST("systemd-logind.service",
SESSION_CLASS_IS_EARLY(s->class) ? NULL : "systemd-user-sessions.service"),
user_record_home_directory(s->user->user_record),
properties,
error,