Merge lp:~andreserl/maas-images/maas_images_signed_kernel into lp:maas-images

Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 385
Proposed branch: lp:~andreserl/maas-images/maas_images_signed_kernel
Merge into: lp:maas-images
Diff against target: 143 lines (+24/-24)
2 files modified
conf/meph-v2.yaml (+8/-8)
conf/meph-v3.yaml (+16/-16)
To merge this branch: bzr merge lp:~andreserl/maas-images/maas_images_signed_kernel
Reviewer Review Type Date Requested Status
Lee Trager (community) Needs Fixing
Steve Langasek (community) Approve
Review via email: mp+333854@code.launchpad.net

Commit message

Use signed kernel package for amd64.

To post a comment you must log in.
384. By Andres Rodriguez

Fix formatting

Revision history for this message
Steve Langasek (vorlon) wrote :

Sorry if I was unclear - the "signed" package variants are amd64-only.

review: Needs Fixing
385. By Andres Rodriguez

Remove i386

Revision history for this message
Steve Langasek (vorlon) wrote :

Thanks, this now looks correct.

Note that while this corrects the names odd of the packages that should be fed to curtin, the code which extracts the kernel for netbooting must also be checked to ensure it's using the right filename since these kernels provide vmlinuz.efi.signed instead of vmlinuz.

review: Approve
Revision history for this message
Lee Trager (ltrager) wrote :

Thanks for pointing that out Steve. lp:maas-images looks for a file in /boot starting with the name vmlinuz[1]. Since the unsigned vmlinuz filename is shorter then the signed filename I suspect lp:maas-images will end up using the unsigned kernel. That will need to be fixed in order for MAAS to use a signed kernel in the ephemeral environment.

lp:maas-images will only generate a new image if a new image is posted upstream [2]. That being said is there any reason not to fix this for releases no longer supported?

[1] http://bazaar.launchpad.net/~maas-images-maintainers/maas-images/maas-ephemerals/view/head:/meph2/netinst.py#L327
[2] http://cloud-images.ubuntu.com/daily/

review: Needs Fixing
Revision history for this message
Steve Langasek (vorlon) wrote :

On Fri, Nov 17, 2017 at 12:04:21AM -0000, Lee Trager wrote:

> lp:maas-images will only generate a new image if a new image is posted
> upstream [2]. That being said is there any reason not to fix this for
> releases no longer supported?

I don't think there's any reason not to fix it; I also don't see any
particular reason /to/ fix it for no-longer-supported releases.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf/meph-v2.yaml'
2--- conf/meph-v2.yaml 2017-05-03 10:29:59 +0000
3+++ conf/meph-v2.yaml 2017-11-16 22:44:30 +0000
4@@ -45,7 +45,7 @@
5 - version: "17.10"
6 release: artful
7 kernels:
8- - [artful, amd64, hwe-a, generic, linux-generic, *sa_hwe_a]
9+ - [artful, amd64, hwe-a, generic, linux-signed-generic, *sa_hwe_a]
10 - [artful, arm64, hwe-a, generic, linux-generic, *sa_hwe_a]
11 - [artful, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
12 - [artful, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
13@@ -57,7 +57,7 @@
14 - version: "17.04"
15 release: zesty
16 kernels:
17- - [zesty, amd64, hwe-z, generic, linux-generic, *sa_hwe_z]
18+ - [zesty, amd64, hwe-z, generic, linux-signed-generic, *sa_hwe_z]
19 - [zesty, arm64, hwe-z, generic, linux-generic, *sa_hwe_z]
20 - [zesty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
21 - [zesty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
22@@ -81,7 +81,7 @@
23 - version: "16.04"
24 release: xenial
25 kernels:
26- - [xenial, amd64, hwe-x, generic, linux-generic, *sa_hwe_x]
27+ - [xenial, amd64, hwe-x, generic, linux-signed-generic, *sa_hwe_x]
28 - [xenial, arm64, hwe-x, generic, linux-generic, *sa_hwe_x]
29 - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
30 - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
31@@ -133,27 +133,27 @@
32 - [trusty, armhf, hwe-t, generic, linux-generic, *arm_hwe_t]
33 - [trusty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
34 - [trusty, i386, hwe-t, generic, linux-generic, *sa_hwe_t]
35- - [trusty, amd64, hwe-t, generic, linux-generic, *sa_hwe_t]
36+ - [trusty, amd64, hwe-t, generic, linux-signed-generic, *sa_hwe_t]
37 - [trusty, ppc64el, hwe-t, generic, linux-generic, *sa_hwe_t]
38 - [trusty, arm64, hwe-t, generic, linux-generic, *sa_hwe_t]
39 - [trusty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
40 - [trusty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
41- - [utopic, amd64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
42+ - [utopic, amd64, hwe-u, generic, linux-signed-generic-lts-utopic, *sa_hwe_u]
43 - [utopic, arm64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
44 - [utopic, armhf, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
45 - [utopic, i386, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
46 - [utopic, ppc64el, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
47- - [vivid, amd64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
48+ - [vivid, amd64, hwe-v, generic, linux-signed-generic-lts-vivid, *sa_hwe_v]
49 - [vivid, arm64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
50 - [vivid, armhf, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
51 - [vivid, i386, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
52 - [vivid, ppc64el, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
53- - [wily, amd64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
54+ - [wily, amd64, hwe-w, generic, linux-signed-generic-lts-wily, *sa_hwe_w]
55 - [wily, arm64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
56 - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
57 - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
58 - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
59- - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
60+ - [xenial, amd64, hwe-x, generic, linux-signed-generic-lts-xenial, *sa_hwe_x]
61 - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
62 - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
63 - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
64
65=== modified file 'conf/meph-v3.yaml'
66--- conf/meph-v3.yaml 2017-05-03 10:29:59 +0000
67+++ conf/meph-v3.yaml 2017-11-16 22:44:30 +0000
68@@ -52,8 +52,8 @@
69 - version: "17.10"
70 release: artful
71 kernels:
72- - [artful, amd64, ga-17.10, generic, linux-generic, *sa_hwe_a]
73- - [artful, amd64, ga-17.10, lowlatency, linux-image-lowlatency, *sa_hwe_a]
74+ - [artful, amd64, ga-17.10, generic, linux-signed-generic, *sa_hwe_a]
75+ - [artful, amd64, ga-17.10, lowlatency, linux-signed-image-lowlatency, *sa_hwe_a]
76 - [artful, arm64, ga-17.10, generic, linux-generic, *sa_hwe_a]
77 - [artful, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
78 - [artful, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
79@@ -66,8 +66,8 @@
80 - version: "17.04"
81 release: zesty
82 kernels:
83- - [zesty, amd64, ga-17.04, generic, linux-generic, *sa_hwe_z]
84- - [zesty, amd64, ga-17.04, lowlatency, linux-image-lowlatency, *sa_hwe_z]
85+ - [zesty, amd64, ga-17.04, generic, linux-signed-generic, *sa_hwe_z]
86+ - [zesty, amd64, ga-17.04, lowlatency, linux-signed-image-lowlatency, *sa_hwe_z]
87 - [zesty, arm64, ga-17.04, generic, linux-generic, *sa_hwe_z]
88 - [zesty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
89 - [zesty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
90@@ -94,12 +94,12 @@
91 - version: "16.04"
92 release: xenial
93 kernels:
94- - [xenial, amd64, ga-16.04, generic, linux-generic, *sa_hwe_x]
95- - [xenial, amd64, ga-16.04, lowlatency, linux-lowlatency, *sa_hwe_x]
96- - [xenial, amd64, hwe-16.04, generic, linux-generic-hwe-16.04, *sa_hwe_x]
97- - [xenial, amd64, hwe-16.04, lowlatency, linux-lowlatency-hwe-16.04, *sa_hwe_x]
98- - [xenial, amd64, hwe-16.04-edge, generic, linux-generic-hwe-16.04-edge, *sa_hwe_x_edge]
99- - [xenial, amd64, hwe-16.04-edge, lowlatency, linux-lowlatency-hwe-16.04-edge, *sa_hwe_x_edge]
100+ - [xenial, amd64, ga-16.04, generic, linux-signed-generic, *sa_hwe_x]
101+ - [xenial, amd64, ga-16.04, lowlatency, linux-signed-lowlatency, *sa_hwe_x]
102+ - [xenial, amd64, hwe-16.04, generic, linux-signed-generic-hwe-16.04, *sa_hwe_x]
103+ - [xenial, amd64, hwe-16.04, lowlatency, linux-signed-lowlatency-hwe-16.04, *sa_hwe_x]
104+ - [xenial, amd64, hwe-16.04-edge, generic, linux-signed-generic-hwe-16.04-edge, *sa_hwe_x_edge]
105+ - [xenial, amd64, hwe-16.04-edge, lowlatency, linux-signed-lowlatency-hwe-16.04-edge, *sa_hwe_x_edge]
106 - [xenial, arm64, ga-16.04, generic, linux-generic, *sa_hwe_x]
107 - [xenial, arm64, hwe-16.04, generic, linux-generic-hwe-16.04, *sa_hwe_x]
108 - [xenial, arm64, hwe-16.04-edge, generic, linux-generic-hwe-16.04-edge, *sa_hwe_x_edge]
109@@ -128,28 +128,28 @@
110 - [trusty, armhf, hwe-t, generic, linux-generic, *arm_hwe_t]
111 - [trusty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
112 - [trusty, i386, hwe-t, generic, linux-generic, *sa_hwe_t]
113- - [trusty, amd64, hwe-t, generic, linux-generic, *sa_hwe_t]
114+ - [trusty, amd64, hwe-t, generic, linux-signed-generic, *sa_hwe_t]
115 - [trusty, ppc64el, hwe-t, generic, linux-generic, *sa_hwe_t]
116 - [trusty, arm64, hwe-t, generic, linux-generic, *sa_hwe_t]
117 - [trusty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
118 - [trusty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
119- - [utopic, amd64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
120+ - [utopic, amd64, hwe-u, generic, linux-signed-generic-lts-utopic, *sa_hwe_u]
121 - [utopic, arm64, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
122 - [utopic, armhf, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
123 - [utopic, i386, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
124 - [utopic, ppc64el, hwe-u, generic, linux-generic-lts-utopic, *sa_hwe_u]
125- - [vivid, amd64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
126+ - [vivid, amd64, hwe-v, generic, linux-signed-generic-lts-vivid, *sa_hwe_v]
127 - [vivid, arm64, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
128 - [vivid, armhf, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
129 - [vivid, i386, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
130 - [vivid, ppc64el, hwe-v, generic, linux-generic-lts-vivid, *sa_hwe_v]
131- - [wily, amd64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
132+ - [wily, amd64, hwe-w, generic, linux-signed-generic-lts-wily, *sa_hwe_w]
133 - [wily, arm64, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
134 - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
135 - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
136 - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
137- - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_legacy]
138- - [xenial, amd64, hwe-x, lowlatency, linux-lowlatency, *sa_hwe_x_legacy]
139+ - [xenial, amd64, hwe-x, generic, linux-signed-generic-lts-xenial, *sa_hwe_x_legacy]
140+ - [xenial, amd64, hwe-x, lowlatency, linux-signed-lowlatency, *sa_hwe_x_legacy]
141 - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_legacy]
142 - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_legacy]
143 - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_legacy]

Subscribers

People subscribed via source and target branches