Merge lp:~mterry/policykit-unity8/systemd into lp:policykit-unity8

Proposed by Michael Terry
Status: Work in progress
Proposed branch: lp:~mterry/policykit-unity8/systemd
Merge into: lp:policykit-unity8
Diff against target: 53 lines (+28/-3)
3 files modified
data/CMakeLists.txt (+18/-3)
data/policykit-unity8.override (+1/-0)
data/policykit-unity8.service.in (+9/-0)
To merge this branch: bzr merge lp:~mterry/policykit-unity8/systemd
Reviewer Review Type Date Requested Status
Unity API Team Pending
Review via email: mp+321559@code.launchpad.net

Commit message

WIP

To post a comment you must log in.
lp:~mterry/policykit-unity8/systemd updated
22. By Michael Terry

Fix install path

Unmerged revisions

22. By Michael Terry

Fix install path

21. By Michael Terry

First pass at systemd file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2016-04-06 15:08:31 +0000
3+++ data/CMakeLists.txt 2017-04-03 13:44:23 +0000
4@@ -1,10 +1,25 @@
5
6-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unity8-policy-kit.conf.in
7- ${CMAKE_CURRENT_BINARY_DIR}/unity8-policy-kit.conf
8+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/policykit-unity8.conf.in
9+ ${CMAKE_CURRENT_BINARY_DIR}/policykit-unity8.conf
10+ @ONLY
11+)
12+
13+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/policykit-unity8.service.in
14+ ${CMAKE_CURRENT_BINARY_DIR}/policykit-unity8.service
15 @ONLY
16 )
17
18 install(
19- FILES ${CMAKE_CURRENT_BINARY_DIR}/unity8-policy-kit.conf
20+ FILES ${CMAKE_CURRENT_BINARY_DIR}/policykit-unity8.conf
21 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions"
22 )
23+
24+install(
25+ FILES policykit-unity8.override
26+ DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart"
27+)
28+
29+install(
30+ FILES ${CMAKE_CURRENT_BINARY_DIR}/policykit-unity8.service
31+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/user"
32+)
33
34=== renamed file 'data/unity8-policy-kit.conf.in' => 'data/policykit-unity8.conf.in'
35=== added file 'data/policykit-unity8.override'
36--- data/policykit-unity8.override 1970-01-01 00:00:00 +0000
37+++ data/policykit-unity8.override 2017-04-03 13:44:23 +0000
38@@ -0,0 +1,1 @@
39+manual
40
41=== added file 'data/policykit-unity8.service.in'
42--- data/policykit-unity8.service.in 1970-01-01 00:00:00 +0000
43+++ data/policykit-unity8.service.in 2017-04-03 13:44:23 +0000
44@@ -0,0 +1,9 @@
45+[Unit]
46+Description=PolicyKit user agent for Unity 8
47+PartOf=graphical-session.target
48+After=unity8.service
49+BindsTo=unity8.service
50+
51+[Service]
52+ExecStart=@CMAKE_INSTALL_FULL_PKGLIBEXECDIR@/policykit-agent
53+Restart=on-failure

Subscribers

People subscribed via source and target branches

to all changes: