Browse Source

238/239 : Fix session finalization

While migrating the v237/v238 commits, a migration error caused
session_may_gc() to always return false.
This caused closed sessions to stay on state "closing" forever.

Bug: https://github.com/elogind/elogind/issues/82
Closes: https://github.com/elogind/elogind/issues/82
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
tags/debian-devuan_common
Sven Eden Mark Hindley <mark@hindley.org.uk> 3 years ago
parent
commit
93998e41af
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/login/logind-session.c
  2. +2
    -2
      src/login/logind.c

+ 1
- 1
src/login/logind-session.c View File

@@ -1068,8 +1068,8 @@ bool session_may_gc(Session *s, bool drop_not_started) {
return false;

if (s->scope && manager_unit_is_active(s->manager, s->scope))
#endif // 0
return false;
#endif // 0

return true;
}


+ 2
- 2
src/login/logind.c View File

@@ -784,9 +784,9 @@ static int manager_connect_bus(Manager *m) {
"Subscribe",
NULL, NULL,
NULL);
#endif // 0
if (r < 0)
return log_error_errno(r, "Failed to enable subscription: %m");
#endif // 0

r = sd_bus_request_name_async(m->bus, NULL, "org.freedesktop.login1", 0, NULL, NULL);
if (r < 0)
@@ -969,8 +969,8 @@ static int manager_connect_udev(Manager *m) {
return r;
}

/* Don't bother watching VCSA devices, if nobody cares */
#if 0 /// elogind does not support autospawning of vts
/* Don't bother watching VCSA devices, if nobody cares */
if (m->n_autovts > 0 && m->console_active_fd >= 0) {

m->udev_vcsa_monitor = udev_monitor_new_from_netlink(m->udev, "udev");


Loading…
Cancel
Save