[systemd-commits] stable Branch 'v208-stable' - 5 commits - src/login

[Michal Sekletar]

 src/login/logind-session.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 8d29b9bc8fa8b1d74c20810d5817b33bab8529ee
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Tue Mar 11 13:26:38 2014 +0100

    logind: initialize timer_fd

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 2a2a670..d7c3187 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -89,6 +89,7 @@ Session* session_new(Manager *m, const char *id) {
 
         s->manager = m;
         s->fifo_fd = -1;
+        s->timer_fd = -1;
 
         return s;
 }

commit 930bd712d867e77611f911991b2d55f1cbce92f0
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Mon Mar 10 18:26:34 2014 +0100

    logind: save user state after stopping the session

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 3ab41e6..2a2a670 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -685,6 +685,8 @@ int session_stop(Session *s) {
         s->stopping = true;
 
         session_save(s);
+        user_save(s);
+
         return r;
 }
 

commit 708bc5bfd86b87c3ab086c5b00a32885728a8155
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Mon Mar 10 18:22:55 2014 +0100

    logind: save session after setting the stopping flag

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index e519d35..3ab41e6 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -682,10 +682,9 @@ int session_stop(Session *s) {
         /* Kill cgroup */
         r = session_stop_scope(s);
 
-        session_save(s);
-
         s->stopping = true;
 
+        session_save(s);
         return r;
 }
 

commit a1ff5dcf1d82433f6a660f0c1ae66f786e2133a6
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Mon Mar 10 18:11:45 2014 +0100

    logind: add forgotten call to user_send_changed()

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index f31961a..e519d35 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -587,6 +587,7 @@ int session_start(Session *s) {
 
         /* Send signals */
         session_send_signal(s, true);
+        user_send_changed(s->user, "Sessions\0");
 
         if (s->seat) {
                 if (s->seat->active == s)

commit e6e2819b162ae890c680679e6311c70d509d07d1
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Mon Mar 10 17:47:35 2014 +0100

    logind: fix reference to systemd-user-sessions.service

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 2bac0a2..f31961a 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -518,7 +518,7 @@ static int session_start_scope(Session *s) {
                 if (!scope)
                         return log_oom();
 
-                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-session.service", &error, &job);
+                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-sessions.service", &error, &job);
                 if (r < 0) {
                         log_error("Failed to start session scope %s: %s %s",
                                   scope, bus_error(&error, r), error.name);