Merge lp:~xnox/ubiquity/move-keyboard-early into lp:ubiquity

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Jean-Baptiste Lallement
Approved revision: 6582
Merged at revision: 6583
Proposed branch: lp:~xnox/ubiquity/move-keyboard-early
Merge into: lp:ubiquity
Diff against target: 49 lines (+4/-4)
4 files modified
ubiquity/plugins/ubi-console-setup.py (+1/-1)
ubiquity/plugins/ubi-timezone.py (+1/-1)
ubiquity/plugins/ubi-usersetup.py (+1/-1)
ubiquity/plugins/ubi-wireless.py (+1/-1)
To merge this branch: bzr merge lp:~xnox/ubiquity/move-keyboard-early
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Łukasz Zemczak Approve
Review via email: mp+335661@code.launchpad.net

Description of the change

I think this will do it. But tests need to be fixed too.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Finally found time to test it. I adjusted the autopilot tests here, tested locally to be passing now:
https://code.launchpad.net/~sil2100/ubiquity/xnox-lang-autopilot-fixes/+merge/337162

Let's get both merged.

review: Approve
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

LGTM. I built and tested the deb packages successfully on latest bionic iso.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubiquity/plugins/ubi-console-setup.py'
--- ubiquity/plugins/ubi-console-setup.py 2017-09-07 12:18:10 +0000
+++ ubiquity/plugins/ubi-console-setup.py 2018-01-03 15:05:17 +0000
@@ -27,7 +27,7 @@
2727
2828
29NAME = 'console_setup'29NAME = 'console_setup'
30AFTER = 'timezone'30AFTER = 'language'
31WEIGHT = 1031WEIGHT = 10
3232
3333
3434
=== modified file 'ubiquity/plugins/ubi-timezone.py'
--- ubiquity/plugins/ubi-timezone.py 2017-12-22 21:42:39 +0000
+++ ubiquity/plugins/ubi-timezone.py 2018-01-03 15:05:17 +0000
@@ -33,7 +33,7 @@
3333
34NAME = 'timezone'34NAME = 'timezone'
35# after partman for default install, but language for oem install35# after partman for default install, but language for oem install
36AFTER = ['partman', 'language']36AFTER = ['partman', 'console_setup']
37WEIGHT = 1037WEIGHT = 10
3838
39_geoname_url = 'https://geoname-lookup.ubuntu.com/?query=%s&release=%s'39_geoname_url = 'https://geoname-lookup.ubuntu.com/?query=%s&release=%s'
4040
=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py 2016-08-26 07:13:37 +0000
+++ ubiquity/plugins/ubi-usersetup.py 2018-01-03 15:05:17 +0000
@@ -35,7 +35,7 @@
3535
3636
37NAME = 'usersetup'37NAME = 'usersetup'
38AFTER = 'console_setup'38AFTER = 'timezone'
39WEIGHT = 1039WEIGHT = 10
4040
4141
4242
=== modified file 'ubiquity/plugins/ubi-wireless.py'
--- ubiquity/plugins/ubi-wireless.py 2017-03-06 16:54:28 +0000
+++ ubiquity/plugins/ubi-wireless.py 2018-01-03 15:05:17 +0000
@@ -24,7 +24,7 @@
2424
25NAME = 'wireless'25NAME = 'wireless'
26# after prepare for default install, but language for oem install26# after prepare for default install, but language for oem install
27AFTER = 'language'27AFTER = 'console_setup'
28WEIGHT = 1228WEIGHT = 12
2929
3030

Subscribers

People subscribed via source and target branches

to status/vote changes: