openstack
/
diskimage-builder
Code Issues Proposed changes

ubuntu-minimal: fix HWE install for focal 

On Focal, install the 20.04 HWE kernel if linux-image-hwe is
specified.

Change-Id: I5d536e8f64e7b987415849d8cd4da7959bba7af7
This commit is contained in:
Ian Wienand 2020-05-12 13:09:30 +10:00
parent 138d3f9b81
commit c5acc91574
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
diskimage_builder/elements/ubuntu-minimal/package-installs.yaml
View File

@ -9,7 +9,15 @@ linux-image-virtual:
when: DIB_UBUNTU_KERNEL = linux-image-virtual
linux-generic-hwe-18.04:
not-arch: arm64
when: DIB_UBUNTU_KERNEL = linux-image-hwe
when:
- DIB_UBUNTU_KERNEL = linux-image-hwe
- DIB_RELEASE = bionic
linux-generic-hwe-20.04:
not-arch: arm64
when:
- DIB_UBUNTU_KERNEL = linux-image-hwe
- DIB_RELEASE = focal
# TODO(ianw): this is Xenial specific, for now. This kernel works
# much better, however, including better support for cdrom's for
# config-drive. We'll need to filter this further for future