Merge lp:~mterry/ubuntu-system-settings/restart-maliit into lp:ubuntu-system-settings

Proposed by Michael Terry
Status: Merged
Approved by: Michael Terry
Approved revision: 982
Merged at revision: 988
Proposed branch: lp:~mterry/ubuntu-system-settings/restart-maliit
Merge into: lp:ubuntu-system-settings
Diff against target: 14 lines (+4/-0)
1 file modified
wizard/ubuntu-system-settings-wizard-cleanup.conf (+4/-0)
To merge this branch: bzr merge lp:~mterry/ubuntu-system-settings/restart-maliit
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+233045@code.launchpad.net

Commit message

Fix the OSK not working on first boot.
When the wizard closes, shut down maliit-server and the indicators so that unity8 can start them itself. LP: 1362679

This was my fault, when I added logic to restart maliit-server and indicators after the language screen, I just moved those lines from the end of the wizard to the language screen. But we also need to restart after the wizard to capture the changed MIR_SOCKET value.

Description of the change

Fix the OSK not working on first boot.
When the wizard closes, shut down maliit-server and the indicators so that unity8 can start them itself. LP: 1362679

This was my fault, when I added logic to restart maliit-server and indicators after the language screen, I just moved those lines from the end of the wizard to the language screen. But we also need to restart after the wizard to capture the changed MIR_SOCKET value.

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 NA, just upstart change

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 NA, just upstart change

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 Yes

 * Has a 5 minute exploratory testing run been executed on N4?
 Yes

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 NA

 * What components might get impacted by your changes?
 Just wizard

 * Have you requested review by the teams of these owning components?
 That's me I guess

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Makes sense, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wizard/ubuntu-system-settings-wizard-cleanup.conf'
2--- wizard/ubuntu-system-settings-wizard-cleanup.conf 2014-08-18 14:19:13 +0000
3+++ wizard/ubuntu-system-settings-wizard-cleanup.conf 2014-09-02 12:50:12 +0000
4@@ -24,6 +24,10 @@
5 echo "Resetting MIR_SOCKET to $WIZARD_ORIG_MIR_SOCKET"
6 setenv MIR_SOCKET $WIZARD_ORIG_MIR_SOCKET
7 fi
8+
9+ # Stop any indicators and OSK so they will be restarted with new environment
10+ initctl emit indicator-services-end
11+ stop maliit-server || true
12 end script
13
14 post-stop script

Subscribers

People subscribed via source and target branches