openstack/diskimage-builder
Code Issues Proposed changes

Merge "Update default Ubuntu to noble (latest LTS)"

Browse Source
This commit is contained in:
Zuul 2024-12-12 16:59:24 +00:00 committed by Gerrit Code Review
commit 95e3479548
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/ubuntu-common/environment.d/10-ubuntu-distro-name.bash
View File

@ -1,5 +1,5 @@
export DISTRO_NAME=${DISTRO_NAME:-ubuntu} export DISTRO_NAME=${DISTRO_NAME:-ubuntu}
export DIB_RELEASE=${DIB_RELEASE:-focal} export DIB_RELEASE=${DIB_RELEASE:-noble}
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,universe} export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,universe}
export EFI_BOOT_DIR="EFI/ubuntu" export EFI_BOOT_DIR="EFI/ubuntu"

2
diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball
View File

@ -12,7 +12,7 @@ set -o pipefail
shopt -s extglob shopt -s extglob
DIB_RELEASE=${DIB_RELEASE:-trusty} DIB_RELEASE=${DIB_RELEASE:-noble}
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://cloud-images.ubuntu.com/$DIB_RELEASE/current} DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://cloud-images.ubuntu.com/$DIB_RELEASE/current}
if [ $DIB_RELEASE != "trusty" ] ; then if [ $DIB_RELEASE != "trusty" ] ; then
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$DIB_RELEASE-server-cloudimg-$ARCH.squashfs} BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$DIB_RELEASE-server-cloudimg-$ARCH.squashfs}