picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #265 from smcv/logind-runtimedir-race-write-earlier

Browse source 
logind: save /run/systemd/users/UID before starting user@.service
This commit is contained in:
Lennart Poettering 2015-06-17 19:52:04 +02:00
parent 9ee7a50c0b 71161305f1
commit b0fc0763d3
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/login/logind-user.c
View file

@ -106,7 +106,7 @@ void user_free(User *u) {
free(u);
}
int user_save(User *u) {
static int user_save_internal(User *u) {
_cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
@ -114,9 +114,6 @@ int user_save(User *u) {
assert(u);
assert(u->state_file);
if (!u->started)
return 0;
r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0);
if (r < 0)
goto finish;
@ -259,6 +256,15 @@ finish:
return r;
}
int user_save(User *u) {
assert(u);
if (!u->started)
return 0;
return user_save_internal (u);
}
int user_load(User *u) {
_cleanup_free_ char *display = NULL, *realtime = NULL, *monotonic = NULL;
Session *s = NULL;
@ -458,6 +464,12 @@ int user_start(User *u) {
if (r < 0)
return r;
/* Save the user data so far, because pam_systemd will read the
* XDG_RUNTIME_DIR out of it while starting up systemd --user.
* We need to do user_save_internal() because we have not
* "officially" started yet. */
user_save_internal(u);
/* Spawn user systemd */
r = user_start_service(u);
if (r < 0)
@ -709,7 +721,7 @@ UserState user_get_state(User *u) {
if (u->stopping)
return USER_CLOSING;
if (u->slice_job || u->service_job)
if (!u->started || u->slice_job || u->service_job)
return USER_OPENING;
if (u->sessions) {