diff --git a/Containerfile b/Containerfile index e5b3d08..1a659b3 100644 --- a/Containerfile +++ b/Containerfile @@ -43,8 +43,9 @@ ARG SOURCE_TAG="40" ## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${SOURCE_TAG} -### 2.1 Add ZFS RPMS -COPY --from=ghcr.io/ublue-os/ucore-kmods:stable /rpms/ /tmp/rpms +### 2.1 Add ZFS RPMS and matching kernel RPMs +COPY --from=ghcr.io/0ranki/sb-zfs-kernel /rpms/ /tmp/rpms +COPY --from=ghcr.io/0ranki/sb-zfs-kernel /kernel/ /tmp/kernel ### 3. MODIFICATIONS diff --git a/build.sh b/build.sh index 5c342e0..5451acc 100755 --- a/build.sh +++ b/build.sh @@ -15,7 +15,7 @@ ZFS_KERNEL_VERSION="$(find /tmp/rpms/kmods/zfs/ -name "kmod-zfs*.rpm" ! -name "* # https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1 # this installs a package from fedora repos -rpm-ostree install kernel-${ZFS_KERNEL_VERSION} +rpm-ostree install /tmp/kernel/*.rpm rpm-ostree override remove zfs-fuse --install /tmp/rpms/kmods/zfs/*.rpm # this would install a package from rpmfusion