From e3aacb67ada526501a8c080c219ee2be869b959b Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Mon, 8 Jul 2019 10:28:01 -0700 Subject: [PATCH] Switch the default Ubuntu kernel to -virtual A previous patch changed the default Ubuntu kernel for the amphora images to the -kvm kernel[1]. This kernel is missing a module required for cryptsetup. This patch switches the default to the -virtual kernel, which is slightly larger than the -kvm kernel, but includes the required kernel module for cryptsetup. [1] https://review.opendev.org/665861 Change-Id: Ia05d7e9f8ac2692e5769648255ef0e4e10a18c03 --- diskimage-create/README.rst | 2 +- diskimage-create/diskimage-create.sh | 4 ++-- ...Use-Ubuntu-KVM-kernel-for-Amphora-a1e8af8bc7893011.yaml | 7 ------- ...Ubuntu-virtual-kernel-for-Amphora-a1e8af8bc7893011.yaml | 7 +++++++ 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 releasenotes/notes/Use-Ubuntu-KVM-kernel-for-Amphora-a1e8af8bc7893011.yaml create mode 100644 releasenotes/notes/Use-Ubuntu-virtual-kernel-for-Amphora-a1e8af8bc7893011.yaml diff --git a/diskimage-create/README.rst b/diskimage-create/README.rst index 2c528888bc..abf7649caa 100644 --- a/diskimage-create/README.rst +++ b/diskimage-create/README.rst @@ -128,7 +128,7 @@ Command syntax: '-f' disable tmpfs for build '-h' display help message '-i' is the base OS (default: ubuntu-minimal) - '-k' is the kernel meta package name, currently only for ubuntu-minimal base OS (default: linux-image-kvm) + '-k' is the kernel meta package name, currently only for ubuntu-minimal base OS (default: linux-image-virtual) '-l' is output logfile (default: none) '-n' disable sshd (default: enabled) '-o' is the output image file name diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index b6702ed3dc..3b09b8708c 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -48,7 +48,7 @@ usage() { echo " '-f' disable tmpfs for build" echo " '-h' display this help message" echo " '-i' is the base OS (default: ubuntu-minimal)" - echo " '-k' is the kernel meta package name, currently only for ubuntu-minimal base OS (default: linux-image-kvm)" + echo " '-k' is the kernel meta package name, currently only for ubuntu-minimal base OS (default: linux-image-virtual)" echo " '-l' is output logfile (default: none)" echo " '-n' disable sshd (default: enabled)" echo " '-o' is the output image file name" @@ -221,7 +221,7 @@ AMP_IMAGETYPE=${AMP_IMAGETYPE:-"qcow2"} AMP_IMAGESIZE=${AMP_IMAGESIZE:-2} if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then - export DIB_UBUNTU_KERNEL=${AMP_KERNEL:-"linux-image-kvm"} + export DIB_UBUNTU_KERNEL=${AMP_KERNEL:-"linux-image-virtual"} fi AMP_DISABLE_SSHD=${AMP_DISABLE_SSHD:-0} diff --git a/releasenotes/notes/Use-Ubuntu-KVM-kernel-for-Amphora-a1e8af8bc7893011.yaml b/releasenotes/notes/Use-Ubuntu-KVM-kernel-for-Amphora-a1e8af8bc7893011.yaml deleted file mode 100644 index 8ae707e875..0000000000 --- a/releasenotes/notes/Use-Ubuntu-KVM-kernel-for-Amphora-a1e8af8bc7893011.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -features: - - | - The default kernel for the amphora image has switched from - linux-image-generic to linux-image-kvm, resulting in an image size - reduction of about 200MB. The linux-image-kvm kernel works with kvm, - qemu tcg, and Xen hypervisors among others. diff --git a/releasenotes/notes/Use-Ubuntu-virtual-kernel-for-Amphora-a1e8af8bc7893011.yaml b/releasenotes/notes/Use-Ubuntu-virtual-kernel-for-Amphora-a1e8af8bc7893011.yaml new file mode 100644 index 0000000000..e2357593a6 --- /dev/null +++ b/releasenotes/notes/Use-Ubuntu-virtual-kernel-for-Amphora-a1e8af8bc7893011.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + The default kernel for the amphora image has switched from + linux-image-generic to linux-image-virtual, resulting in an image size + reduction of about 150MB. The linux-image-virtual kernel works with kvm, + qemu tcg, and Xen hypervisors among others.