openstack
/
diskimage-builder
Code Issues Proposed changes

Cleanup uses of DIB_IMAGE_ROOT_FS_UUID variable 

Since 2.4.0 disk-image-create does not export DIB_IMAGE_ROOT_FS_UUID
anymore. This patch fix documentation and the iso element.

Closes-Bug: 1699273
Change-Id: I5e926c36256e580579bfd2c5aeff4ba6193c367a
This commit is contained in:
Ettore Simone 2024-01-14 11:40:38 +01:00
parent 0168c3057d
commit 741ab26206
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/iso/cleanup.d/100-build-iso
View File

@ -168,7 +168,7 @@ elif echo $IMAGE_ELEMENT | grep -q '\bironic-python-agent\b'; then
elif echo $IMAGE_ELEMENT | grep -q '\bbaremetal\b'; then elif echo $IMAGE_ELEMENT | grep -q '\bbaremetal\b'; then
EMITTED_KERNEL=${IMAGE_NAME}.vmlinuz EMITTED_KERNEL=${IMAGE_NAME}.vmlinuz
EMITTED_RAMDISK=${IMAGE_NAME}.initrd EMITTED_RAMDISK=${IMAGE_NAME}.initrd
EMITTED_KERNEL_CMDLINE_ARGS="root=UUID=$DIB_IMAGE_ROOT_FS_UUID" EMITTED_KERNEL_CMDLINE_ARGS="root=LABEL=${DIB_BOOT_LABEL}"
DIB_BOOT_ISO_KERNEL_CMDLINE_ARGS=${DIB_BOOT_ISO_KERNEL_CMDLINE_ARGS:-} DIB_BOOT_ISO_KERNEL_CMDLINE_ARGS=${DIB_BOOT_ISO_KERNEL_CMDLINE_ARGS:-}
if [ -n "$DIB_BOOT_ISO_KERNEL_CMDLINE_ARGS" ]; then if [ -n "$DIB_BOOT_ISO_KERNEL_CMDLINE_ARGS" ]; then
EMITTED_KERNEL_CMDLINE_ARGS="$EMITTED_KERNEL_CMDLINE_ARGS $DIB_BOOT_ISO_KERNEL_CMDLINE_ARGS" EMITTED_KERNEL_CMDLINE_ARGS="$EMITTED_KERNEL_CMDLINE_ARGS $DIB_BOOT_ISO_KERNEL_CMDLINE_ARGS"

4
doc/source/developer/developing_elements.rst
View File

@ -276,10 +276,6 @@ Global image-build variables
be attempted as the user may have an external cache able to keep the operation be attempted as the user may have an external cache able to keep the operation
functional. functional.
``DIB_IMAGE_ROOT_FS_UUID``
This contains the UUID of the root filesystem, when diskimage-builder is
building a disk image. This works only for ext filesystems.
``DIB_IMAGE_CACHE`` ``DIB_IMAGE_CACHE``
Path to where cached inputs to the build process are stored. Defaults to Path to where cached inputs to the build process are stored. Defaults to
``~/.cache/image_create``. ``~/.cache/image_create``.