From b39098db5e043d5afdbf6bb288b91b233b7b78e1 Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Sat, 22 Feb 2025 17:23:48 -0500
Subject: [PATCH] fix(ci): remove cliwrap

---
 Containerfile      | 3 +++
 build-initramfs.sh | 6 +-----
 install.sh         | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Containerfile b/Containerfile
index b2273c04..80fef664 100644
--- a/Containerfile
+++ b/Containerfile
@@ -45,6 +45,9 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
     --mount=type=bind,from=ctx,src=/,dst=/ctx \
     --mount=type=bind,from=akmods_nvidia,src=/rpms,dst=/tmp/akmods-rpms \
     mkdir -p /var/lib/alternatives && \
+    if [ ! -x /usr/bin/dnf5 ]; then \
+    rpm-ostree install --idempotent dnf5 dnf5-plugins \
+    ; fi && \
     IMAGE_FLAVOR=nvidia /ctx/image-info.sh && \
     NVIDIA_FLAVOR=nvidia /ctx/nvidia-install.sh && \
     /ctx/build-initramfs.sh && \
diff --git a/build-initramfs.sh b/build-initramfs.sh
index ec2c4d36..f4bb8b45 100755
--- a/build-initramfs.sh
+++ b/build-initramfs.sh
@@ -9,12 +9,8 @@ else
     KERNEL_SUFFIX=""
 fi
 
-if [ ! -f /usr/libexec/rpm-ostree/wrapped/dracut ]; then
-    rpm-ostree cliwrap install-to-root /
-fi
-
 QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(|'"$KERNEL_SUFFIX"'-)(\d+\.\d+\.\d+)' | sed -E 's/kernel-(|'"$KERNEL_SUFFIX"'-)//')"
 
-/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
+/usr/bin/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
 
 chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
diff --git a/install.sh b/install.sh
index b13f31f5..1f8a5413 100755
--- a/install.sh
+++ b/install.sh
@@ -18,7 +18,6 @@ if [ "${KERNEL_FLAVOR}" = "asus" ]; then
     # Install Asus kernel
     curl -Lo /etc/yum.repos.d/_copr_lukenukem-asus-linux.repo \
         https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/repo/fedora-"${RELEASE}"/lukenukem-asus-linux-fedora-"${RELEASE}".repo
-    rpm-ostree cliwrap install-to-root /
     rpm-ostree override replace \
         --experimental \
         /tmp/kernel-rpms/kernel-"${KERNEL_VERSION}".rpm \
@@ -33,7 +32,6 @@ elif [ "${KERNEL_FLAVOR}" = "surface" ]; then
     # curl -Lo /tmp/surface-kernel.rpm \
     #     https://github.com/linux-surface/linux-surface/releases/download/silverblue-20201215-1/kernel-20201215-1.x86_64.rpm
     # Install Surface kernel
-    rpm-ostree cliwrap install-to-root /
     rpm-ostree override replace \
         --experimental \
         --remove kernel \