From 4df13456904214c9e036fc8461441b806a3405d9 Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Mon, 29 Jul 2024 09:48:10 +0200
Subject: [PATCH] DO NOT MERGE Use CentOS Stream 10 as base image

This is still experimental.
Current blockers:
- epel 10 repository is still in development
- inotify-tools package for el10 is not available yet
---
 Dockerfile       |  2 +-
 prepare-efi.sh   |  5 ++++-
 prepare-image.sh | 10 ++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5c46fa5f3..73016c11a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=quay.io/centos/centos:stream9
+ARG BASE_IMAGE=quay.io/centos/centos:stream10
 
 ## Build iPXE w/ IPv6 Support
 ## Note: we are pinning to a specific commit for reproducible builds.
diff --git a/prepare-efi.sh b/prepare-efi.sh
index 574d90b9e..65950a959 100755
--- a/prepare-efi.sh
+++ b/prepare-efi.sh
@@ -10,10 +10,12 @@ if [[ "$ARCH" == "x86_64" ]]; then
     PACKAGES=grub2-efi-x64
     BOOTEFI=BOOTX64.EFI
     GRUBEFI=grubx64.efi
+    SHIM_PKG=shim-x64
 elif [[ "$ARCH" == "aarch64" ]]; then
     PACKAGES=grub2-efi-aa64
     BOOTEFI=BOOTAA64.EFI
     GRUBEFI=grubaa64.efi
+    SHIM_PKG=shim-aa64
 else
     echo "WARNING: don't know how to build an EFI image on $ARCH"
     touch "$DEST"
@@ -29,7 +31,8 @@ fi
 # ``Cannot initialize '::'``
 # This is due to the conversion table missing codepage 850, included in glibc-gconv-extra
 # shellcheck disable=SC2086
-dnf install -y grub2 shim dosfstools mtools glibc-gconv-extra $PACKAGES
+dnf install -y mtools dosfstools grub2 shim $SHIM_PKG glibc-gconv-extra $PACKAGES
+#dnf reinstall -y mtools dosfstools grub2 shim $SHIM_PKG glibc-gconv-extra $PACKAGES
 
 ## TODO(TheJulia): At some point we may want to try and make the size
 ## of the ESP image file to be sized smaller for the files that need to
diff --git a/prepare-image.sh b/prepare-image.sh
index 7f59cc866..f48bf1dd7 100755
--- a/prepare-image.sh
+++ b/prepare-image.sh
@@ -8,7 +8,6 @@ echo "tsflags=nodocs" >> /etc/dnf/dnf.conf
 
 dnf install -y 'dnf-command(config-manager)'
 
-# emulate uid/gid configuration to match rpm install
 IRONIC_UID=997
 IRONIC_GID=994
 
@@ -57,6 +56,8 @@ python3 -m pip install --no-cache-dir --ignore-installed --prefix /usr -r "${IRO
 
 # ironic system configuration
 mkdir -p /var/log/ironic /var/lib/ironic
+#getent group "${IRONIC_GID}"
+#getent passwd "${IRONIC_UID}"
 getent group ironic > /dev/null || groupadd -r ironic -g "${IRONIC_GID}"
 getent passwd ironic > /dev/null || useradd -r -g ironic -u "${IRONIC_UID}" -s /sbin/nologin ironic -d /var/lib/ironic
 
@@ -71,9 +72,10 @@ if [[ -n "${EXTRA_PKGS_LIST:-}" ]]; then
     fi
 fi
 
-dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
-dnf config-manager --set-disabled epel
-dnf install -y --enablerepo=epel inotify-tools
+#dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
+#dnf config-manager --set-disabled epel
+#dnf install -y --enablerepo=epel inotify-tools
+dnf install -y https://rpmfind.net/linux/fedora/linux/releases/40/Everything/x86_64/os/Packages/i/inotify-tools-3.22.1.0-7.fc40.x86_64.rpm
 
 dnf remove -y --noautoremove 'dnf-command(config-manager)'