git.iko.soy/unity8
on xenial help sign in
Consolidate unity8-greeter session upstart scripts
dbf6315Michael Terry
data/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -15,6 +15,6 @@ install(FILES 51-${GREETER_APP}.conf
15install(FILES ${GREETER_APP}-wrapper
15install(FILES ${GREETER_APP}-wrapper
16 DESTINATION ${CMAKE_INSTALL_BINDIR}
16 DESTINATION ${CMAKE_INSTALL_BINDIR}
17 )
17 )
18−install(FILES unity8-greeter-init.conf unity8-greeter-ofono.conf
18+install(FILES ${GREETER_APP}-init.conf
19 DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
19 DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
20 )
20 )
data/unity8-greeter-init.conf+1
@@ -6,6 +6,7 @@ task
6emits indicator-services-start
6emits indicator-services-start
7
7
8script
8script
9+ start --no-wait ofono-setup || true
9 initctl emit --no-wait indicator-services-start || true
10 initctl emit --no-wait indicator-services-start || true
10 start --no-wait maliit-server || true
11 start --no-wait maliit-server || true
11end script
12end script
data/unity8-greeter-ofono.confdeleted−9
@@ -1,9 +0,0 @@
1−description "Unity 8 Greeter ofono start"
2−author "Michael Terry <mterry@ubuntu.com>"
3−
4−start on unity8-greeter-started
5−task
6−
7−script
8− start --no-wait ofono-setup
9−end script