From 8d4678b1daad12ec41f4d89ef5e5ecf2e5054e14 Mon Sep 17 00:00:00 2001
From: Benjamin Sherman <benjamin@holyarmy.org>
Date: Thu, 12 Oct 2023 13:12:45 -0500
Subject: [PATCH] refactor: include ublue signing key even on nokmods images

---
 Containerfile    | 1 +
 kmods-install.sh | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index ba618dcd..80ae7a0c 100644
--- a/Containerfile
+++ b/Containerfile
@@ -16,6 +16,7 @@ COPY github-release-install.sh \
         /tmp/
 
 COPY --from=ghcr.io/ublue-os/config:latest /rpms /tmp/rpms
+COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms/ublue-os /tmp/rpms
 
 RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os_staging.repo && \
     wget https://copr.fedorainfracloud.org/coprs/kylegospo/oversteer/repo/fedora-$(rpm -E %fedora)/kylegospo-oversteer-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo_oversteer.repo && \
diff --git a/kmods-install.sh b/kmods-install.sh
index de2b6a73..5646e2ac 100755
--- a/kmods-install.sh
+++ b/kmods-install.sh
@@ -18,7 +18,6 @@ fi
 cp -rf /tmp/kmods-files/* /
 
 
-rpm-ostree install /tmp/akmods-rpms/ublue-os/ublue-os-akmods-addons*.rpm
 for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do
     echo "akmods: enable default entry: ${REPO}"
     sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' ${REPO}