diskimage-builder 3.43.0__tar.gz → 3.44.0__tar.gz

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/.zuul.d/jobs.yaml

@@ -29,8 +29,7 @@
         #- openeuler-minimal/22.03-LTS-build-succeeds
         # Image based tests
         - centos/9-stream-build-succeeds
-        # Disabled until upstream centos-10 image hash file is valid
-        #- centos/10-stream-build-succeeds
+        - centos/10-stream-build-succeeds
         # Containerfile based tests
         - almalinux-container/almalinux-9-build-succeeds
         - almalinux-container/almalinux-10-build-succeeds

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/.zuul.d/project.yaml

@@ -61,8 +61,6 @@
         # while; promote to voting after some stability.
         - dib-devstack-functional-openstack-opensuse-15-src:
             voting: false
-        - dib-devstack-functional-openstack-gentoo-src:
-            voting: false
         - dib-devstack-functional-openstack-debian-bullseye-src:
             voting: false
         - ironic-python-agent-check-image-dib-centos9
@@ -120,3 +118,4 @@
         - nodepool-build-image-siblings
         - dib-devstack-functional-openstack-debian-stretch-src
         - dib-devstack-functional-openstack-debian-buster-src
+        - dib-devstack-functional-openstack-gentoo-src

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/AUTHORS

@@ -122,6 +122,7 @@ Gregory Haynes <greg@greghaynes.net>
 Gregory Thiemonge <gthiemon@redhat.com>
 Gwen Dawes <gjsd2@cam.ac.uk>
 Haomeng, Wang <whaom@cn.ibm.com>
+Harald Jensas <hjensas@redhat.com>
 Harald Jensås <hjensas@redhat.com>
 HeroicHitesh <email.hiteshkumar@gmail.com>
 Hervé Rousseau <hroussea@cern.ch>
@@ -213,6 +214,7 @@ Matthew Thode <mthode@mthode.org>
 Michael Johnson <johnsomor@gmail.com>
 Michael Kerrin <michael.kerrin@hp.com>
 Michael McCune <mimccune@redhat.com>
+Michael Mokricky <mom@mission-embedded.com>
 Michael Still <mikal@stillhq.com>
 Michael Turek <mjturek@linux.vnet.ibm.com>
 Michael Turek <mjturek@us.ibm.com>

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/ChangeLog

@@ -1,11 +1,24 @@
 CHANGES
 =======
 
+3.44.0
+------
+
+* Move gentoo tests to experimental
+* epel: partial revert of Ic6f6c92b28b80c4f0b93e4663129e73134f5b447
+* pip-and-virtualenv don't depend on epel
+* epel: allow epel-release to not be installed at all
+* Refactor 03-reset-bls-entries into an element
+* Refactor 02-set-machine-id into an element
+* Fix centos element BASE\_IMAGE\_FILE
+
 3.43.0
 ------
 
 * Fix typo
 * debootstrap: add DIB\_MMDEBSTRAP\_EXTRA\_ARGS support
+* Replaced usage outdate egrep to grep
+* Fetch a checkout ref into refs/tags, not a branch
 * Declare Python 3.13 support
 * CI: Bump dib flavor disk to 6GB
 * rocky-container: Add support for DIB\_DISTRIBUTION\_MIRROR
@@ -13,6 +26,7 @@ CHANGES
 * Increase devstack Glance total image size limits
 * Bump upper version of flake8
 * Add minimum pyproject.toml
+* Revert "Disable centos/10-stream-build-succeeds functest"
 * Replace debootstrap with mmdebstrap
 * Disable centos/10-stream-build-succeeds functest
 

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diskimage-builder
-Version: 3.43.0
+Version: 3.44.0
 Summary: Golden Disk Image builder.
 Home-page: https://docs.openstack.org/diskimage-builder/latest/
 Author: OpenStack

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/centos/element-deps

@@ -1,5 +1,7 @@
 cache-url
 redhat-common
+redhat-reset-bls-entries
 rpm-distro
 source-repositories
+systemd-machine-id
 yum

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/centos/root.d/10-centos-cloud-image

@@ -42,7 +42,7 @@ else
     else
         dib_release_path=${DIB_RELEASE}
     fi
-    BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$(head -1 < <(curl -s https://cloud.centos.org/centos/${dib_release_path}/${ARCH}/images/ | grep -o "CentOS-.[^>]*${DIB_FLAVOR}-.[^>]*.qcow2" | sort -r))}
+    BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$(head -1 < <(curl -s https://cloud.centos.org/centos/${dib_release_path}/${ARCH}/images/ | grep -v "CentOS-.[^>]*-x86_64-" | grep -o "CentOS-.[^>]*${DIB_FLAVOR}-.[^>]*.qcow2" | sort -r))}
     BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
     IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE
     CACHED_IMAGE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/epel/README.rst

@@ -20,4 +20,5 @@ DIB_EPEL_DISABLED:
    :Required: No
    :Default: 0
    :Description: To disable the EPEL repo (but leave it available if
-                 used with an explicit ``--enablerepo``) set this to 1
+                 used with an explicit ``--enablerepo``) set this to 1.
+                 To avoid installing the epel-release entirely, set this to 2.

diskimage_builder-3.44.0/diskimage_builder/elements/epel/environment.d/10-epel-env-default

@@ -0,0 +1 @@
+export DIB_EPEL_DISABLED=${DIB_EPEL_DISABLED:-0}

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/epel/package-installs.yaml

@@ -1,4 +1,3 @@
-wget:
-  phase: pre-install.d
 yum-utils:
   phase: pre-install.d
+  when: DIB_EPEL_DISABLED != 2

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/epel/pkg-map

@@ -1,20 +1,16 @@
 {
  "distro": {
     "almalinux": {
-       "wget": "wget",
        "yum-utils": "yum-utils"
     },
     "centos": {
-       "wget": "wget",
        "yum-utils": "yum-utils"
     },
     "rocky": {
-       "wget": "wget",
        "yum-utils": "yum-utils"
     }
  },
  "default": {
-   "wget": "",
    "yum-utils": ""
  }
 }

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release

@@ -6,16 +6,20 @@ fi
 set -eu
 set -o pipefail
 
+if [ ${DIB_EPEL_DISABLED:-0} -gt 1 ]; then
+    exit 0
+fi
+
 if [[ (${DISTRO_NAME} =~ "almalinux" || ${DISTRO_NAME} =~ "centos" || ${DISTRO_NAME} =~ "rocky") ]]; then
     # Centos has "epel-release" in extras, which is default enabled.
-    ${YUM} install -y epel-release
+    install-packages epel-release
 else
     echo "$DISTRO_NAME is not supported"
     # Not really a failure; we just don't do anything
     exit 0
 fi
 
-if [ ${DIB_EPEL_DISABLED:-0} -ne 0 ]; then
+if [ ${DIB_EPEL_DISABLED:-0} -gt 0 ]; then
     if [[ ${YUM} == "dnf" ]]; then
         rpm  -q dnf-plugins-core || dnf install -y dnf-plugins-core
         dnf config-manager --set-disabled "epel*"

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/fedora/element-deps

@@ -3,4 +3,5 @@ dkms
 redhat-common
 rpm-distro
 source-repositories
+systemd-machine-id
 yum

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/pip-and-virtualenv/element-deps

@@ -1,5 +1,4 @@
 dib-python
-epel
 install-types
 package-installs
 source-repositories

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/python-stow-versions/install.d/70-python-build

@@ -14,7 +14,7 @@ DIB_VERSIONS_TO_INSTALL=${1:-$DIB_PYTHON_VERSIONS}
 
 # Get pyenv versions
 DIB_PYENV_VERSIONS=$(python-build --definitions \
-    | egrep "^\s*[2,3]\.[0-9]{1,2}\.[0-9]{1,2}$")
+    | grep -E "^\s*[2,3]\.[0-9]{1,2}\.[0-9]{1,2}$")
 
 declare -A DIB_PYTHON_VERSIONS_ARRAY
 

diskimage_builder-3.44.0/diskimage_builder/elements/redhat-reset-bls-entries/README.rst

@@ -0,0 +1,22 @@
+========================
+redhat-reset-bls-entries
+========================
+
+Renames Boot Loader Specification (BLS) entries in
+``/boot/loader/entries/`` to use the machine-id set during the build,
+as a workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2032680.
+
+Upstream qcow2 images for CentOS 9-stream and RHEL 9 ship with
+pre-existing BLS entries named after the image's original machine-id.
+When diskimage-builder sets a new machine-id via ``systemd-machine-id-setup``
+(see the ``systemd-machine-id`` element), these entries are stale and
+``grub2-mkconfig`` will not update them correctly.  This element renames
+each ``*.conf`` entry under ``/boot/loader/entries/`` to match the
+build-time machine-id so that subsequent bootloader configuration steps
+work as expected.
+
+This element is a no-op on releases other than ``9-stream`` (CentOS)
+and ``9`` (RHEL).
+
+This element is pulled in automatically by the ``centos`` and ``rhel``
+elements.

{diskimage_builder-3.43.0/diskimage_builder/elements/rhel → diskimage_builder-3.44.0/diskimage_builder/elements/redhat-reset-bls-entries}/post-install.d/03-reset-bls-entries

@@ -6,7 +6,9 @@ fi
 set -eu
 set -o pipefail
 
-if [[ ! '9' =~ ${DIB_RELEASE} ]]; then
+# This workaround is only needed for releases that ship a qcow2 image
+# with pre-existing BLS entries: centos 9-stream and rhel 9.
+if [[ ! ${DIB_RELEASE} =~ ^(9-stream|9)$ ]]; then
     exit 0
 fi
 

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/rhel/element-deps

@@ -1,6 +1,8 @@
 cache-url
 redhat-common
+redhat-reset-bls-entries
 rhel-common
 rpm-distro
 source-repositories
+systemd-machine-id
 yum

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/elements/source-repositories/extra-data.d/98-source-repositories

@@ -215,10 +215,10 @@ function get_repos_for_element(){
                             +refs/heads/*:refs/heads/* +refs/tags/*:refs/tags/*
                         git_sha=$(sudo git -C ${REPO_DEST} rev-parse HEAD)
                     else
-                        sudo git -C ${REPO_DEST} fetch -q $CACHE_PATH $REPOREF:fetch_$REPOREF
+                        sudo git -C ${REPO_DEST} fetch -q $CACHE_PATH +$REPOREF:refs/tags/fetch_$REPOREF
                         sudo git -C ${REPO_DEST} reset --hard FETCH_HEAD
                         # Get the sha in use
-                        git_sha=$(sudo git -C ${REPO_DEST} rev-parse FETCH_HEAD)
+                        git_sha=$(sudo git -C ${REPO_DEST} rev-parse "FETCH_HEAD^{commit}")
                     fi
 
                     # Write the sha being used into the source-repositories manifest

diskimage_builder-3.44.0/diskimage_builder/elements/systemd-machine-id/README.rst

@@ -0,0 +1,17 @@
+==================
+systemd-machine-id
+==================
+
+Initialises ``/etc/machine-id`` during image build by running
+``systemd-machine-id-setup`` in the pre-install phase.
+
+Image-based builds (e.g. from a qcow2 or tarball) may not have a
+machine-id present.  One may also be absent when systemd has not yet
+been upgraded as part of the build.  Certain kernel install scripts
+check for ``/etc/machine-id`` and bail silently when it is missing,
+leaving kernel packages installed but without an initramfs or kernel
+copied into place.
+
+The machine-id set here is a temporary build-time value.  It is
+cleared by the ``sysprep`` element so that each deployed instance
+receives a unique id on first boot.

{diskimage_builder-3.43.0/diskimage_builder/elements/rhel → diskimage_builder-3.44.0/diskimage_builder/elements/systemd-machine-id}/pre-install.d/02-set-machine-id

@@ -6,7 +6,7 @@ fi
 set -eu
 set -o pipefail
 
-# Set a machine-id.  The .qcow2 image doesn't have one, and sometimes
+# Set a machine-id.  Image-based builds may not have one, and sometimes
 # one will get made (if systemd is upgraded as part of the build
 # process) and sometimes not.  The problem is that certain kernel
 # install scripts bail silently without it; kernel packages end up

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/lib/common-functions

@@ -140,7 +140,7 @@ function generate_hooks () {
 # $1 the break point.
 # $2.. what to call if a break is needed
 function check_break () {
-  if echo "${break:-}" | egrep -e "(,|^)$1(,|$)" -q; then
+  if echo "${break:-}" | grep -E "(,|^)$1(,|$)" -q; then
     echo "Starting debug shell. Exit to resume building." >&2
     echo At stage $1 >&2
     shift

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/lib/disk-image-create

@@ -414,7 +414,7 @@ if [[ "${DIB_SHOW_IMAGE_USAGE:-0}" != 0 ]]; then
     # signal:noise ratio
     if [[ ${DIB_SHOW_IMAGE_USAGE_FULL:-0} == 0 ]]; then
         # numfmt will start giving a decimal place when < 10MiB
-        du_output_show+="| egrep 'MiB|GiB|TiB|PiB' | grep -v '\..MiB'"
+        du_output_show+="| grep -E 'MiB|GiB|TiB|PiB' | grep -v '\..MiB'"
         echo "================================="
         echo "Image size report (files > 10MiB)"
         echo "================================="

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder/lib/ramdisk-image-create

@@ -414,7 +414,7 @@ if [[ "${DIB_SHOW_IMAGE_USAGE:-0}" != 0 ]]; then
     # signal:noise ratio
     if [[ ${DIB_SHOW_IMAGE_USAGE_FULL:-0} == 0 ]]; then
         # numfmt will start giving a decimal place when < 10MiB
-        du_output_show+="| egrep 'MiB|GiB|TiB|PiB' | grep -v '\..MiB'"
+        du_output_show+="| grep -E 'MiB|GiB|TiB|PiB' | grep -v '\..MiB'"
         echo "================================="
         echo "Image size report (files > 10MiB)"
         echo "================================="

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diskimage-builder
-Version: 3.43.0
+Version: 3.44.0
 Summary: Golden Disk Image builder.
 Home-page: https://docs.openstack.org/diskimage-builder/latest/
 Author: OpenStack

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/diskimage_builder.egg-info/SOURCES.txt

@@ -202,9 +202,7 @@ diskimage_builder/elements/centos-minimal/yum.repos.d/8-stream/base.repo
 diskimage_builder/elements/centos-minimal/yum.repos.d/9-stream/appstream.repo
 diskimage_builder/elements/centos-minimal/yum.repos.d/9-stream/base.repo
 diskimage_builder/elements/centos/environment.d/10-centos-distro-name.bash
-diskimage_builder/elements/centos/post-install.d/03-reset-bls-entries
 diskimage_builder/elements/centos/pre-install.d/00-02-set-centos-mirror
-diskimage_builder/elements/centos/pre-install.d/02-set-machine-id
 diskimage_builder/elements/centos/root.d/10-centos-cloud-image
 diskimage_builder/elements/centos/test-elements/10-stream-build-succeeds/README.rst
 diskimage_builder/elements/centos/test-elements/10-stream-build-succeeds/element-deps
@@ -423,6 +421,7 @@ diskimage_builder/elements/epel/README.rst
 diskimage_builder/elements/epel/element-deps
 diskimage_builder/elements/epel/package-installs.yaml
 diskimage_builder/elements/epel/pkg-map
+diskimage_builder/elements/epel/environment.d/10-epel-env-default
 diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
 diskimage_builder/elements/fail2ban/README.rst
 diskimage_builder/elements/fail2ban/element-deps
@@ -456,7 +455,6 @@ diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo
 diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
 diskimage_builder/elements/fedora/environment.d/11-yum-dnf.bash
 diskimage_builder/elements/fedora/pre-install.d/00-02-set-fedora-mirror
-diskimage_builder/elements/fedora/pre-install.d/02-set-machine-id
 diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image
 diskimage_builder/elements/fedora/test-elements/build-succeeds/element-deps
 diskimage_builder/elements/fips/README.rst
@@ -742,6 +740,8 @@ diskimage_builder/elements/redhat-common/package-installs.yaml
 diskimage_builder/elements/redhat-common/bin/map-packages
 diskimage_builder/elements/redhat-common/environment.d/50-redhat-common
 diskimage_builder/elements/redhat-common/finalise.d/01-clean-old-kernels
+diskimage_builder/elements/redhat-reset-bls-entries/README.rst
+diskimage_builder/elements/redhat-reset-bls-entries/post-install.d/03-reset-bls-entries
 diskimage_builder/elements/replace-partition/README.rst
 diskimage_builder/elements/replace-partition/element-deps
 diskimage_builder/elements/replace-partition/element-provides
@@ -762,8 +762,6 @@ diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration
 diskimage_builder/elements/rhel-common/pre-install.d/00-rhsm
 diskimage_builder/elements/rhel-common/pre-install.d/10-rhel-blacklist
 diskimage_builder/elements/rhel/environment.d/10-rhel-distro-name.bash
-diskimage_builder/elements/rhel/post-install.d/03-reset-bls-entries
-diskimage_builder/elements/rhel/pre-install.d/02-set-machine-id
 diskimage_builder/elements/rhel/root.d/10-rhel-cloud-image
 diskimage_builder/elements/rocky-container/README.rst
 diskimage_builder/elements/rocky-container/element-deps
@@ -849,6 +847,8 @@ diskimage_builder/elements/sysctl/bin/sysctl-write-value
 diskimage_builder/elements/sysprep/README.rst
 diskimage_builder/elements/sysprep/bin/extract-image
 diskimage_builder/elements/sysprep/finalise.d/99-clear-machine-id
+diskimage_builder/elements/systemd-machine-id/README.rst
+diskimage_builder/elements/systemd-machine-id/pre-install.d/02-set-machine-id
 diskimage_builder/elements/tpm-emulator/README.rst
 diskimage_builder/elements/tpm-emulator/element-deps
 diskimage_builder/elements/tpm-emulator/package-installs.yaml
@@ -1125,6 +1125,7 @@ releasenotes/notes/dib-init-system_fix_for_debian_jessie-c6f7261ee84dad27.yaml
 releasenotes/notes/dib-python-deprecate-8401c35a87559076.yaml
 releasenotes/notes/dib-run-parts-6f67d038aa5a4156.yaml
 releasenotes/notes/dib-run-parts-e18cc3a6c2d66c24.yaml
+releasenotes/notes/dib_epel_disabled-55caa271f9959b32.yaml
 releasenotes/notes/dibv2-omnibus-b30e0c7ecd76db8d.yaml
 releasenotes/notes/doc-auto-element-dependency-cb7488c5bb7301a4.yaml
 releasenotes/notes/dpkg-copy-keys-578e16f7fedd823b.yaml
@@ -1203,6 +1204,7 @@ releasenotes/notes/simple-init-nm-delay-f579e05467785219.yaml
 releasenotes/notes/simple-init-nm-f0896124dee92a03.yaml
 releasenotes/notes/simple-init-remove-cloud-init-929b271310e0f774.yaml
 releasenotes/notes/skip-packages-env-c97e7b4820f9bfda.yaml
+releasenotes/notes/source-repositories-annotated-tag-7c1f4a9be2d3508a.yaml
 releasenotes/notes/specify-bootstrap-packages-via-env-22f5c6982c09f16a.yaml
 releasenotes/notes/squashfs-output-91c1f0dc37474d3c.yaml
 releasenotes/notes/start-using-reno-446b3d52a467a273.yaml

diskimage_builder-3.44.0/diskimage_builder.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "cc408112", "is_release": true}

diskimage_builder-3.44.0/releasenotes/notes/dib_epel_disabled-55caa271f9959b32.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Previously `DIB_EPEL_DISABLED` was documented to install epel-release
+    but disable the repositories when set to `1`. It is now possible to
+    avoid installing the epel-release package entirely by setting
+    `DIB_EPEL_DISABLED` to `2`. This is to accomodate scenarios where
+    using EPEL is strictly forbidden.

diskimage_builder-3.44.0/releasenotes/notes/source-repositories-annotated-tag-7c1f4a9be2d3508a.yaml

@@ -0,0 +1,12 @@
+---
+fixes:
+  - |
+    Fixed ``source-repositories`` failing to check out a repository pinned to
+    an annotated tag. The requested ref was fetched into
+    ``refs/heads/fetch_<ref>``, and git refuses to write a tag object to a
+    branch, which aborted the build. The ref is now fetched into
+    ``refs/tags/fetch_<ref>``, which can hold a tag object.
+  - |
+    The ``source-repositories`` git manifest now records the commit hash for a
+    repository pinned to an annotated tag, rather than the hash of the tag
+    object.

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/tests/run_functests.sh

@@ -48,10 +48,6 @@ DEFAULT_SKIP_TESTS=(
     # No longer reasonable to test upstream (lacks a mirror in infra)
     # Note this is centos6 and should probably be removed
     centos/build-succeeds
-    # Disabled because CentOS Stream is no currently publishing valid
-    # image hash files (the files are empty so images cannot be validated
-    # leading to test failures)
-    centos/10-stream-build-succeeds
 
     # This job is a bit unreliable, even if we get mirroring
     debian-minimal/testing-build-succeeds

{diskimage_builder-3.43.0 → diskimage_builder-3.44.0}/tools/functional-test-check.sh

@@ -81,7 +81,7 @@ function sshintonode {
     #  glean@lo.service    loaded active exited    Glean for interface lo with NetworkManager
     # ---
     # So if we see anything other than 'loaded active exited' we have a problem.
-    glean_status=$(/tmp/ssh_wrapper $node -- "systemctl | egrep 'glean[@|-]' | { grep -v 'loaded active exited' || true; }")
+    glean_status=$(/tmp/ssh_wrapper $node -- "systemctl | grep -E 'glean[@|-]' | { grep -v 'loaded active exited' || true; }")
     if [[ ${glean_status} != '' ]]; then
         echo "*** Glean not loaded correctly"
         echo "*** saw: ${glean_status}"

diskimage_builder-3.43.0/diskimage_builder/elements/centos/post-install.d/03-reset-bls-entries

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-if [[ ! '9-stream' =~ ${DIB_RELEASE} ]]; then
-    exit 0
-fi
-
-# This is a workaround for the grub issue reported upstream with
-#  https://bugzilla.redhat.com/show_bug.cgi?id=2032680
-
-# This renames the BLS entries from the upstream .qcow2 image in
-# /boot/loader/entries with the current machine-id. This means that in the
-# bootloader setup, grub2-mkconfig will update config options as required.
-
-pushd /boot/loader/entries
-
-machine_id=$(</etc/machine-id)
-
-for entry in *.conf; do
-    new_entry=$(echo $entry | sed "s/^[a-f0-9]*/$machine_id/")
-    echo "renaming $entry to $new_entry for new machine-id"
-    if [[ $entry != $new_entry ]]; then
-        mv $entry $new_entry
-    fi
-done
-popd
-
-echo "--- Show kernels ---"
-grubby --info=ALL

diskimage_builder-3.43.0/diskimage_builder/elements/centos/pre-install.d/02-set-machine-id

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-# Set a machine-id.  The .qcow2 image doesn't have one, and sometimes
-# one will get made (if systemd is upgraded as part of the build
-# process) and sometimes not.  The problem is that certain kernel
-# install scripts bail silently without it; kernel packages end up
-# being installed but the initramfs etc isn't copied into place.
-#
-# Note this is cleared out in the sysprep role.
-#
-# See also:
-#  768c5e188c1b4bff01da14a49b96b51301db4c03 : similar thing for fedora
-#  https://bugzilla.redhat.com/show_bug.cgi?id=1737355 : upstream bug
-#  https://bugzilla.redhat.com/show_bug.cgi?id=1486124 : unresolved
-#   bug about kernel install requiring machine-id
-
-systemd-machine-id-setup

diskimage_builder-3.43.0/diskimage_builder/elements/fedora/pre-install.d/02-set-machine-id

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-# The systemd .spec file does this in %post [1] and it turns out that
-# (in what is possibly a bug [2]) that kernel install requires
-# /etc/machine-id.  This affects "fedora" (the image-based build) if
-# there is no systemd update to install ... with "fedora-minimal" we
-# are always installing into the chroot so, so %post always runs and
-# this is always run
-#
-# [1] https://src.fedoraproject.org/rpms/systemd/blob/master/f/systemd.spec
-# [2] https://bugzilla.redhat.com/show_bug.cgi?id=1486124
-
-systemd-machine-id-setup

diskimage_builder-3.43.0/diskimage_builder.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "95f1f96b", "is_release": true}