lp:~3v1n0/unity/systemd-unit-fixes

Branch merges

Merged into lp:unity at revision 4193

Andrea Azzarone: Approve on 2016-09-08

Ted Gould (community): Approve on 2016-09-07

Iain Lane: Approve (systemd-units) on 2016-09-07

Marco Trevisan (Treviño): Pending requested 2016-09-02

Diff: 967 lines (+538/-66)

31 files modified

data/CMakeLists.txt (+7/-1)
data/unity7.conf.in (+2/-19)
data/unity7.override (+1/-0)
data/unity7.service.in (+15/-0)
debian/control (+23/-21)
debian/libunity-core-6.0-9.install (+3/-2)
debian/unity-services.install (+4/-1)
debian/unity-services.links (+13/-0)
debian/unity.install (+4/-0)
debian/unity.links (+1/-0)
lockscreen/LockScreenController.cpp (+5/-0)
lockscreen/LockScreenController.h (+3/-0)
services/CMakeLists.txt (+31/-0)
services/unity-panel-service-lockscreen.conf.in (+3/-1)
services/unity-panel-service-lockscreen.override (+1/-0)
services/unity-panel-service-lockscreen.service.in (+2/-1)
services/unity-panel-service.conf.in (+3/-1)
services/unity-panel-service.override (+1/-0)
services/unity-panel-service.service.in (+10/-0)
services/unity-screen-locked.target (+5/-0)
tests/CMakeLists.txt (+1/-0)
tests/test_lockscreen_controller.cpp (+5/-2)
tests/test_systemd_wrapper.cpp (+110/-0)
tools/CMakeLists.txt (+6/-0)
tools/compiz-profile-selector.in (+19/-0)
tools/systemd-prestart-check (+29/-0)
tools/unity.cmake (+63/-17)
tools/upstart-prestart-check (+17/-0)
unity-shared/CMakeLists.txt (+1/-0)
unity-shared/SystemdWrapper.cpp (+96/-0)
unity-shared/SystemdWrapper.h (+54/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4219. By Marco Trevisan (Treviño) on 2016-09-06

unity-panel-service.service: set it back to After, or stopping it will stop the whole shell

4218. By Marco Trevisan (Treviño) on 2016-09-06

systemd-prestart-check: use systemctl --user cancel to stop the currently running job

4217. By Marco Trevisan (Treviño) on 2016-09-05

systemd-prestart-check: ouch, I forgot to rename var...

4216. By Marco Trevisan (Treviño) on 2016-09-05

systemd-prestart-check: remove empty first line

4215. By Marco Trevisan (Treviño) on 2016-09-05

upstart-prestart-check: don't print anything from systemctl

4214. By Marco Trevisan (Treviño) on 2016-09-05

systemd-prestart-check: try to cancel the current running job if it's an unity one

4213. By Marco Trevisan (Treviño) on 2016-09-05

upstart-prestart-check: remove the set -e.

We want control things manually here

4212. By Marco Trevisan (Treviño) on 2016-09-05

upstart-prestart-check: return invalid values on failures

4211. By Marco Trevisan (Treviño) on 2016-09-05

upstart conf: add pre-start to check if unity can run in this environment

4210. By Marco Trevisan (Treviño) on 2016-09-05

Systemd services: add pre-start to check if unity can run in this environment