diff --git a/Dockerfile b/Dockerfile index d575241..e121e10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN cd /etc/yum.repos.d/ && \ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-fedora-$(rpm -E %fedora).repo && \ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-addons-fedora-$(rpm -E %fedora).repo && cd /tmp -RUN dnf -y install kernel-cachyos-lts kernel-cachyos-lts-headers kernel-cachyos-lts-devel akmod-nvidia akmod-VirtualBox +RUN dnf -y install kernel-cachyos-bore-eevdf kernel-cachyos-bore-eevdf-headers kernel-cachyos-bore-eevdf-devel akmod-nvidia akmod-VirtualBox COPY akmods.sh /tmp/akmods.sh RUN /tmp/akmods.sh @@ -77,7 +77,7 @@ COPY install-nvidia.sh /tmp/install-nvidia.sh RUN cd /etc/yum.repos.d/ && wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-addons-fedora-$(rpm -E %fedora).repo # add bore-sysctl and uksmd-lts -RUN rpm-ostree install bore-sysctl uksmd-lts +RUN rpm-ostree install bore-sysctl uksmd # enable systemd services RUN systemctl enable rpm-ostreed-automatic.timer @@ -91,10 +91,10 @@ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos/repo/fe # Enable cliwrap. RUN rpm-ostree cliwrap install-to-root / && \ # Replace the kernel, kernel-core and kernel-modules packages. -rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install kernel-cachyos-lts +rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install kernel-cachyos-bore-eevdf # install kernel headers -RUN rpm-ostree override remove kernel-headers --install kernel-cachyos-lts-headers +RUN rpm-ostree override remove kernel-headers --install kernel-cachyos-bore-eevdf-headers # install akmods RUN ls /tmp/nvidia && /tmp/install-nvidia.sh diff --git a/akmods.sh b/akmods.sh index b1429d1..16bbb90 100755 --- a/akmods.sh +++ b/akmods.sh @@ -1,5 +1,5 @@ #!/bin/sh -KERNEL_VERSION="$(rpm -q kernel-cachyos-lts --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" +KERNEL_VERSION="$(rpm -q kernel-cachyos-bore-eevdf --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" akmods --force --kernels "${KERNEL_VERSION}" diff --git a/install-nvidia.sh b/install-nvidia.sh index 1cd4705..8c85584 100755 --- a/install-nvidia.sh +++ b/install-nvidia.sh @@ -1,5 +1,5 @@ #!/bin/sh -KERNEL_VERSION="$(rpm -q kernel-cachyos-lts --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" +KERNEL_VERSION="$(rpm -q kernel-cachyos-bore-eevdf --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" rpm-ostree install /tmp/nvidia/*${KERNEL_VERSION}*.rpm