chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: save /run/systemd/users/UID before starting user@.service
[elogind.git]
/
src
/
login
/
logind-user.c
diff --git
a/src/login/logind-user.c
b/src/login/logind-user.c
index 738e69ccede5be4acbda32d3dc18e5d52eb0bbec..21d7268120a9b115ce621951d8447cc86370a3c1 100644
(file)
--- a/
src/login/logind-user.c
+++ b/
src/login/logind-user.c
@@
-106,7
+106,7
@@
void user_free(User *u) {
free(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;
_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);
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;
r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0);
if (r < 0)
goto finish;
@@
-259,6
+256,15
@@
finish:
return r;
}
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;
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;
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)
/* 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->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) {
return USER_OPENING;
if (u->sessions) {