[Merge] lp:~serge-hallyn/ubuntu/utopic/systemd-shim/shim-abandoncg into lp:ubuntu/systemd-shim

[James Hunt]

This fix is also required for bug 1357252.

The code changes look fine to me (although I'm not very familiar with the codebase). Just a few queries:

- src/systemd-shim.c : There's a chunk of code that's #if-0'd out. Can this be removed?

- I was imagining when I heard that systemd-shim was now long-running that it would exit when the session exits but I now see that it starts on-demand and then stays running for the duration of the boot to allow it to service requests from multiple sessions. Now that it is maintaining state, what's the implication of it stopping on error and being restarted?

- Does the shim need an apparmor policy now it's long-running?
-- 
https://code.launchpad.net/~serge-hallyn/ubuntu/utopic/systemd-shim/shim-abandoncg/+merge/233280
Your team Ubuntu branches is requested to review the proposed merge of lp:~serge-hallyn/ubuntu/utopic/systemd-shim/shim-abandoncg into lp:ubuntu/systemd-shim.