diff --git a/cosmic.sh b/cosmic.sh index b890aca..c6b40d4 100755 --- a/cosmic.sh +++ b/cosmic.sh @@ -132,63 +132,35 @@ else ZFS_RPMS=() fi -# Nvidia Modprobe and Dracut -echo "options nvidia NVreg_TemporaryFilePath=/var/tmp" >>/usr/lib/modprobe.d/nvidia-atomic.conf - -tee /usr/lib/modprobe.d/nvidia-modeset.conf <<'EOF' -# Nvidia modesetting support. Set to 0 or comment to disable kernel modesetting -# support. This must be disabled in case of SLI Mosaic. +# Delete Kernel Packages for Install +for pkg in kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra; do + rpm --erase $pkg --nodeps +done -options nvidia-drm modeset=1 fbdev=1 -EOF +# Enable Repo +sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo -echo 'force_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-peermem nvidia-uvm "' >>/usr/lib/dracut/dracut.conf.d/99-nvidia.conf +# Install +dnf5 install -y "${PACKAGES[@]}" "${KERNEL_RPMS[@]}" "${AKMODS_RPMS[@]}" "${ZFS_RPMS[@]}" -# Fetch Nvidia or Delete Nvidia Configs +# Fetch Nvidia if [[ "${IMAGE}" =~ cosmic-nvidia ]]; then - skopeo copy docker://ghcr.io/ublue-os/akmods-nvidia:"${KERNEL_FLAVOR}"-"$(rpm -E %fedora)"-"${QUALIFIED_KERNEL}" dir:/tmp/akmods-rpms + dnf5 config-manager setopt fedora-multimedia.enabled=0 + dnf5 config-manager addrepo --from-repofile=https://negativo17.org/repos/fedora-nvidia.repo NVIDIA_TARGZ=$(jq -r '.layers[].digest'