From d4a166e28bb29feabb2092fd1e85ac31bc763280 Mon Sep 17 00:00:00 2001 From: Elvin Luff Date: Mon, 15 Apr 2024 10:17:58 +0200 Subject: [PATCH 1/2] feat: add cockpit-zfs-manager for zfs builds --- ucore/install-ucore-minimal.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ucore/install-ucore-minimal.sh b/ucore/install-ucore-minimal.sh index 82ed27f..d2f6b87 100755 --- a/ucore/install-ucore-minimal.sh +++ b/ucore/install-ucore-minimal.sh @@ -34,6 +34,9 @@ if [[ "-zfs" == "${ZFS_TAG}" ]]; then pv # for some reason depmod ran automatically with zfs 2.1 but not with 2.2 depmod -A ${KERNEL} + + curl -L https://github.com/45Drives/cockpit-zfs-manager/archive/refs/tags/v1.3.1.tar.gz | tar xz -C /tmp + mv /tmp/cockpit-zfs-manager-1.3.1/zfs /usr/share/cockpit fi ## CONDITIONAL: install NVIDIA From 43e8b3b4d44474d35f9554ca915565b43bb1120d Mon Sep 17 00:00:00 2001 From: Elvin Luff Date: Mon, 15 Apr 2024 10:26:28 +0200 Subject: [PATCH 2/2] feat: add detail to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f352214..41a9e31 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ Suitable for running containerized workloads on either bare metal or virtual mac - [nvidia container selinux policy](https://github.com/NVIDIA/dgx-selinux/tree/master/src/nvidia-container-selinux) - allows using `--security-opt label=type:nvidia_container_t` for some jobs (some will still need `--security-opt label=disable` as suggested by nvidia) - Optional [ZFS versions](#tag-matrix) add: - [ZFS driver](https://github.com/ublue-os/ucore-kmods) - latest driver (currently pinned to 2.2.x series) + - [cockpit-zfs-manager](https://github.com/45Drives/cockpit-zfs-manager) (an interactive ZFS on Linux admin package for Cockpit) - [sanoid/syncoid dependencies](https://github.com/jimsalterjrs/sanoid) - [see below](#zfs) for details - note: on `ucore-minimal` images, only `pv` is installed - Disables Zincati auto upgrade/reboot service