From f9287fe2ae958d78a0d07b42db46ae2b77f35bbc Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Thu, 25 Aug 2022 10:51:25 +0200 Subject: [PATCH] changed release check logic in lvm element Change-Id: I83b3c2dad3b0d6006ae23307ae7a8a83b12806e7 --- diskimage_builder/elements/lvm/root.d/10-lvm-check-distro | 4 ++-- releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml diff --git a/diskimage_builder/elements/lvm/root.d/10-lvm-check-distro b/diskimage_builder/elements/lvm/root.d/10-lvm-check-distro index 09de0b78..8386926d 100755 --- a/diskimage_builder/elements/lvm/root.d/10-lvm-check-distro +++ b/diskimage_builder/elements/lvm/root.d/10-lvm-check-distro @@ -11,7 +11,7 @@ if [ 'ubuntu' != $DISTRO_NAME ]; then exit 1 fi -if [[ ! $DIB_RELEASE =~ (xenial|bionic|focal) ]]; then - echo "Only xenial/bionic/focal are supported for LVM support. The DIB_RELEASE is set to $DIB_RELEASE" +if [[ $DIB_RELEASE =~ trusty ]]; then + echo "Trusty release does not have LVM support. The DIB_RELEASE is set to $DIB_RELEASE" exit 1 fi diff --git a/releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml b/releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml new file mode 100644 index 00000000..eb484faf --- /dev/null +++ b/releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Allow processing 'jammy' ubuntu release in lvm