summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-03-05 17:18:47 +0100
committerGitHub <noreply@github.com>2018-03-05 17:18:47 +0100
commit8c6414be15bac95c34262b73766c64524c25772e (patch)
treeec5e8db7d56d0e35a28cfcb6cccf5d41921a6957 /src
parentb719b66b0a9aee379dba14dd03062bdfa99c360d (diff)
parentf8f9419e8765dd427301fa479fb014c5f92250ed (diff)
downloadsystemd-8c6414be15bac95c34262b73766c64524c25772e.tar.gz
Merge pull request #8345 from sourcejedi/logind_restart_is_sorely_lacking_in_testing
login: fix for #8343
Diffstat (limited to 'src')
-rw-r--r--src/login/logind-session-device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index c64fb4359b..73eee72515 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -526,7 +526,7 @@ int session_device_save(SessionDevice *sd) {
return 0;
m = strjoina("FDSTORE=1\n"
- "FDNAME=session", sd->session->id);
+ "FDNAME=session-", sd->session->id);
r = sd_pid_notify_with_fds(0, false, m, &sd->fd, 1);
if (r < 0)
@@ -543,5 +543,6 @@ void session_device_attach_fd(SessionDevice *sd, int fd, bool active) {
assert(!sd->active);
sd->fd = fd;
+ sd->pushed_fd = true;
sd->active = active;
}