Merge lp:~townsend/unity8-preview-lxc/fix-kill-user into lp:unity8-preview-lxc/stable

Proposed by Christopher Townsend
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 53
Merged at revision: 57
Proposed branch: lp:~townsend/unity8-preview-lxc/fix-kill-user
Merge into: lp:unity8-preview-lxc/stable
Diff against target: 12 lines (+2/-2)
1 file modified
bin/unity8-lxc-session (+2/-2)
To merge this branch: bzr merge lp:~townsend/unity8-preview-lxc/fix-kill-user
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+259927@code.launchpad.net

Commit message

Terminate the session instead of killing the user when logging out of the Unity 8 LXC session. This is much less aggressive and keeps ssh sessions alive.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Without prejudice.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/unity8-lxc-session'
2--- bin/unity8-lxc-session 2014-11-20 20:43:32 +0000
3+++ bin/unity8-lxc-session 2015-05-22 13:42:11 +0000
4@@ -59,6 +59,6 @@
5 EOF
6 ) | lxc-attach -n $CONTAINER_NAME -- bash
7
8-# Tell logind to kill the user to clean up from logging out of the
9+# Tell logind to terminate the session to clean up from logging out of the
10 # Unity 8 session inside the container.
11-loginctl kill-user $SUDO_USER
12+loginctl terminate-session $XDG_SESSION_ID

Subscribers

People subscribed via source and target branches

to all changes: