disable rpmfusion and use proper FROM

Containerfile

@@ -10,8 +10,7 @@ FROM ghcr.io/${SOURCE_ORG}/${KERNEL_FLAVOR}-kernel:${KERNEL_VERSION} AS kernel
 FROM scratch AS ctx
 COPY / /
 
-#FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS main
-FROM git.shermanclan.net/bsherman/silverblue-main-neg17:${FEDORA_MAJOR_VERSION} AS main
+FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS main
 
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}"

install.sh

@@ -9,6 +9,9 @@ if [ "${KERNEL_FLAVOR}" = "main" ]; then
     exit 0
 fi
 
+# disable any remaining rpmfusion repos
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion*.repo
+
 # do HWE specific things
 if [ "${KERNEL_FLAVOR}" = "asus" ]; then
     echo "install.sh: steps for KERNEL_FLAVOR: ${KERNEL_FLAVOR}"

nvidia-install.sh

@@ -4,6 +4,9 @@ set -ouex pipefail
 
 RELEASE="$(rpm -E %fedora)"
 
+# disable any remaining rpmfusion repos
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion*.repo
+
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo
 
 ## nvidia install steps
@@ -13,7 +16,7 @@ rpm-ostree install /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm
 sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/eyecantcu-supergfxctl.repo
 sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
 #NOTE: nvidia drivers are already provided by negativo17-fedora-multimedia.repo, no need to enable
-#sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo
+sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo
 
 source /tmp/akmods-rpms/kmods/nvidia-vars