From bf0534c2ceb4e5d222eaed57cb0eebf2cfe7429a Mon Sep 17 00:00:00 2001 From: mitchejj Date: Sat, 23 Dec 2023 12:40:07 -0500 Subject: [PATCH] should have working zfs 2.1.x now --- Containerfile.beaker | 4 ++-- zed/zfs-install.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 zed/zfs-install.sh diff --git a/Containerfile.beaker b/Containerfile.beaker index c8181c5..83d4e50 100644 --- a/Containerfile.beaker +++ b/Containerfile.beaker @@ -26,8 +26,8 @@ FROM beaker AS beaker-zed COPY --from=ghcr.io/mitchejj/zfs-kmods:39 *.rpm /tmp/zfs/ COPY ./zed /tmp -RUN rpm-ostree install /tmp/zfs/*.rpm && \ +RUN /tmp/zfs-install.sh && \ cp /tmp/etc/sysctl.d/*.conf /etc/sysctl.d/ -RUN rm -rf /tmp/* && \ +RUN rm -rf /tmp/* /var/* && \ ostree container commit diff --git a/zed/zfs-install.sh b/zed/zfs-install.sh new file mode 100755 index 0000000..db3d784 --- /dev/null +++ b/zed/zfs-install.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -ouex pipefail + + +KERNEL="$(rpm -q kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" + +ls -lah /var +rpm-ostree install /tmp/zfs/*.rpm +depmod -A ${KERNEL}