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

Proposed by Dimitri John Ledkov on 2018-01-03
Status: Merged
Approved by: Jean-Baptiste Lallement on 2018-02-06
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 2018-01-03 Approve on 2018-02-06
Łukasz Zemczak 2018-01-03 Approve on 2018-02-05
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.
Ł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
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
1=== modified file 'ubiquity/plugins/ubi-console-setup.py'
2--- ubiquity/plugins/ubi-console-setup.py 2017-09-07 12:18:10 +0000
3+++ ubiquity/plugins/ubi-console-setup.py 2018-01-03 15:05:17 +0000
4@@ -27,7 +27,7 @@
5
6
7 NAME = 'console_setup'
8-AFTER = 'timezone'
9+AFTER = 'language'
10 WEIGHT = 10
11
12
13
14=== modified file 'ubiquity/plugins/ubi-timezone.py'
15--- ubiquity/plugins/ubi-timezone.py 2017-12-22 21:42:39 +0000
16+++ ubiquity/plugins/ubi-timezone.py 2018-01-03 15:05:17 +0000
17@@ -33,7 +33,7 @@
18
19 NAME = 'timezone'
20 # after partman for default install, but language for oem install
21-AFTER = ['partman', 'language']
22+AFTER = ['partman', 'console_setup']
23 WEIGHT = 10
24
25 _geoname_url = 'https://geoname-lookup.ubuntu.com/?query=%s&release=%s'
26
27=== modified file 'ubiquity/plugins/ubi-usersetup.py'
28--- ubiquity/plugins/ubi-usersetup.py 2016-08-26 07:13:37 +0000
29+++ ubiquity/plugins/ubi-usersetup.py 2018-01-03 15:05:17 +0000
30@@ -35,7 +35,7 @@
31
32
33 NAME = 'usersetup'
34-AFTER = 'console_setup'
35+AFTER = 'timezone'
36 WEIGHT = 10
37
38
39
40=== modified file 'ubiquity/plugins/ubi-wireless.py'
41--- ubiquity/plugins/ubi-wireless.py 2017-03-06 16:54:28 +0000
42+++ ubiquity/plugins/ubi-wireless.py 2018-01-03 15:05:17 +0000
43@@ -24,7 +24,7 @@
44
45 NAME = 'wireless'
46 # after prepare for default install, but language for oem install
47-AFTER = 'language'
48+AFTER = 'console_setup'
49 WEIGHT = 12
50
51

Subscribers

People subscribed via source and target branches

to status/vote changes: