on xenial help sign in
Start maliit-server in greeter
commit86621152fe8edb1c73f35cf66d4cc8781c746db5 authorMichael Terry <michael.terry@canonical.com> dateThu 13 Mar 2014, 10:20 (13 years ago) parent37ab689
2 files changed+8−3
plugins/LightDM/Upstart.cpp+5−1 plugins/LightDM/unity8-greeter-init.conf+3−2
plugins/LightDM/Upstart.cpp+5−1
@@ -69,7 +69,11 @@ Upstart::Upstart(QObject *parent)
6969 if (QString(qgetenv("UPSTART_SESSION")).isEmpty())
7070 {
7171 QProcess *upstart = new QProcess(this);
72− upstart->start("/sbin/init --user --startup-event=unity8-greeter-started");
72+ QString command = "/sbin/init --user --startup-event=unity8-greeter-started";
73+ // in main.cpp, we convert client to server. Convert back here.
74+ if (qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver")
75+ command.prepend("/usr/bin/env QT_QPA_PLATFORM=ubuntumirclient ");
76+ upstart->start(command);
7377 }
7478}
7579
plugins/LightDM/unity8-greeter-init.conf+3−2
@@ -6,6 +6,7 @@ emits indicator-services-start
66task
77
88script
9− initctl emit indicator-services-start
10− initctl start ofono-setup
9+ initctl emit --no-wait indicator-services-start
10+ initctl start --no-wait ofono-setup || true
11+ initctl start --no-wait maliit-server || true
1112end script