diff --git a/Containerfile b/Containerfile index be16cc13a4..f12951912f 100644 --- a/Containerfile +++ b/Containerfile @@ -659,25 +659,24 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ rm -r /tmp/bazzite-schema-test && \ sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-rom-properties.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-webapp-manager.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_che-nerd-fonts.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_sentry-switcheroo-control_discrete.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_mavit-discover-overlay.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/tailscale.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/charm.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-steam.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-rar.repo && \ + dnf5 -y -q copr disable kylegospo/bazzite && \ + dnf5 -y -q copr disable kylegospo/bazzite-multilib && \ + dnf5 -y -q copr disable ublue-os/staging && \ + dnf5 -y -q copr disable kylegospo/LatencyFleX && \ + dnf5 -y -q copr disable kylegospo/obs-vkcapture && \ + dnf5 -y -q copr disable kylegospo/wallpaper-engine-kde-plugin && \ + dnf5 -y -q copr disable ycollet/audinux && \ + dnf5 -y -q copr disable kylegospo/rom-properties && \ + dnf5 -y -q copr disable kylegospo/webapp-manager && \ + dnf5 -y -q copr disable hhd-dev/hhd && \ + dnf5 -y -q copr disable che/nerd-fonts && \ + dnf5 -y -q copr disable sentry/switcheroo-control_discrete && \ + dnf5 -y -q copr disable hikariknight/looking-glass-kvmfr && \ sed -i 's#/var/lib/selinux#/etc/selinux#g' /usr/lib/python3.*/site-packages/setroubleshoot/util.py && \ mkdir -p /etc/flatpak/remotes.d && \ curl -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo && \ @@ -730,13 +729,13 @@ COPY system_files/deck/shared system_files/deck/${BASE_IMAGE_NAME} / # Setup Copr repos RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \ + dnf5 -y -q copr enable kylegospo/bazzite && \ + dnf5 -y -q copr enable kylegospo/bazzite-multilib && \ + dnf5 -y -q copr enable kylegospo/LatencyFleX && \ + dnf5 -y -q copr enable kylegospo/obs-vkcapture && \ + dnf5 -y -q copr enable kylegospo/wallpaper-engine-kde-plugin && \ + dnf5 -y -q copr enable ycollet/audinux && \ + dnf5 -y -q copr enable hhd-dev/hhd && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit @@ -827,13 +826,13 @@ RUN /usr/libexec/containerbuild/image-info && \ sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/input-remapper-gtk.desktop && \ cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \ + dnf5 -y -q copr disable kylegospo/bazzite && \ + dnf5 -y -q copr disable kylegospo/bazzite-multilib && \ + dnf5 -y -q copr disable kylegospo/LatencyFleX && \ + dnf5 -y -q copr disable kylegospo/obs-vkcapture && \ + dnf5 -y -q copr disable kylegospo/wallpaper-engine-kde-plugin && \ + dnf5 -y -q copr disable ycollet/audinux && \ + dnf5 -y -q copr disable hhd-dev/hhd && \ if grep -q "silverblue" <<< "${BASE_IMAGE_NAME}"; then \ systemctl disable gdm.service && \ systemctl enable sddm.service \