Consolidate unity8-greeter session upstart scripts
commitdbf6315a7ad1b91e21fec4c9277fac267ab396f0
authorMichael Terry <michael.terry@canonical.com>
dateFri 9 May 2014, 12:52 (12 years ago)
parent0fd30cf
data/CMakeLists.txt+1−1
@@ -15,6 +15,6 @@ install(FILES 51-${GREETER_APP}.conf
1515install(FILES ${GREETER_APP}-wrapper
1616 DESTINATION ${CMAKE_INSTALL_BINDIR}
1717 )
18−install(FILES unity8-greeter-init.conf unity8-greeter-ofono.conf
18+install(FILES ${GREETER_APP}-init.conf
1919 DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
2020 )
data/unity8-greeter-init.conf+1
@@ -6,6 +6,7 @@ task
66emits indicator-services-start
77
88script
9+ start --no-wait ofono-setup || true
910 initctl emit --no-wait indicator-services-start || true
1011 start --no-wait maliit-server || true
1112end 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