From 4b94a52aba735cc86610959387191af665feb965 Mon Sep 17 00:00:00 2001
From: John McGee <jmcgee@kidraye.com>
Date: Sun, 17 Mar 2024 15:04:13 -0400
Subject: [PATCH 1/4] feat: add ucore corp repo and install sanoid

---
 ucore/install-ucore-minimal.sh | 3 +++
 ucore/install-ucore.sh         | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/ucore/install-ucore-minimal.sh b/ucore/install-ucore-minimal.sh
index fbb7918..87f598a 100755
--- a/ucore/install-ucore-minimal.sh
+++ b/ucore/install-ucore-minimal.sh
@@ -16,6 +16,9 @@ for REPO in $(ls /etc/yum.repos.d/fedora-updates-testing{,-modular}.repo); do
 done
 fi
 
+# add the ucore copr repo
+curl -L https://copr.fedorainfracloud.org/coprs/ublue-os/ucore/repo/fedora/ublue-os-ucore-fedora.repo -o /etc/yum.repos.d/ublue-os-ucore-fedora.repo
+
 # always disable cisco-open264 repo
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo
 
diff --git a/ucore/install-ucore.sh b/ucore/install-ucore.sh
index df4ff0c..e741367 100755
--- a/ucore/install-ucore.sh
+++ b/ucore/install-ucore.sh
@@ -2,6 +2,11 @@
 
 set -ouex pipefail
 
+## CONDITIONAL: install sanoid if ZFS
+if [[ "-zfs" == "${ZFS_TAG}" ]]; then
+    rpm-ostree install sanoid 
+fi
+
 # install packages.json stuffs
 export IMAGE_NAME=ucore
 /tmp/packages.sh

From 24e90aa35f9a0fd06753f0b1269f6e30a0de5367 Mon Sep 17 00:00:00 2001
From: John McGee <jmcgee@kidraye.com>
Date: Sun, 17 Mar 2024 20:35:55 -0400
Subject: [PATCH 2/4] remove sanoid deps from minimal.  fix zfs_tag arg in
 containerfile

---
 ucore/Containerfile            |  1 +
 ucore/install-ucore-minimal.sh | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/ucore/Containerfile b/ucore/Containerfile
index b3a422e..e781370 100644
--- a/ucore/Containerfile
+++ b/ucore/Containerfile
@@ -37,6 +37,7 @@ COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-
 FROM ucore-minimal AS ucore
 
 ARG COREOS_VERSION="${COREOS_VERSION:-stable}"
+ARG ZFS_TAG="${ZFS_TAG}"
 
 COPY *.sh /tmp/
 COPY packages.json /tmp/packages.json
diff --git a/ucore/install-ucore-minimal.sh b/ucore/install-ucore-minimal.sh
index 87f598a..45c33d2 100755
--- a/ucore/install-ucore-minimal.sh
+++ b/ucore/install-ucore-minimal.sh
@@ -31,15 +31,7 @@ rpm-ostree install /tmp/rpms/ublue-os-ucore-addons-*.rpm
 ## CONDITIONAL: install ZFS (and sanoid deps)
 if [[ "-zfs" == "${ZFS_TAG}" ]]; then
     rpm-ostree install /tmp/rpms/zfs/*.rpm \
-      lzop \
-      mbuffer \
-      mhash \
-      perl-Capture-Tiny \
-      perl-Config-IniFiles \
-      perl-Data-Dumper \
-      perl-Getopt-Long \
-      perl-Sys-Hostname \
-      pv
+      perl-Sys-Hostname
     # for some reason depmod ran automatically with zfs 2.1 but not with 2.2
     depmod -A ${KERNEL}
 fi

From cd826d5a8450646d36c08332642876a6346e2dd8 Mon Sep 17 00:00:00 2001
From: John McGee <jmcgee@kidraye.com>
Date: Sun, 17 Mar 2024 22:53:19 -0400
Subject: [PATCH 3/4] remove trailing space

---
 ucore/install-ucore.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ucore/install-ucore.sh b/ucore/install-ucore.sh
index e741367..2907afd 100755
--- a/ucore/install-ucore.sh
+++ b/ucore/install-ucore.sh
@@ -4,7 +4,7 @@ set -ouex pipefail
 
 ## CONDITIONAL: install sanoid if ZFS
 if [[ "-zfs" == "${ZFS_TAG}" ]]; then
-    rpm-ostree install sanoid 
+    rpm-ostree install sanoid
 fi
 
 # install packages.json stuffs

From 53da451ef3394206d35b01bf4de7a4096d7d8020 Mon Sep 17 00:00:00 2001
From: John McGee <jmcgee@kidraye.com>
Date: Sun, 17 Mar 2024 23:26:50 -0400
Subject: [PATCH 4/4] remove perl-sys-hostname and readd pv

---
 ucore/install-ucore-minimal.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ucore/install-ucore-minimal.sh b/ucore/install-ucore-minimal.sh
index 45c33d2..f77cd6f 100755
--- a/ucore/install-ucore-minimal.sh
+++ b/ucore/install-ucore-minimal.sh
@@ -31,7 +31,7 @@ rpm-ostree install /tmp/rpms/ublue-os-ucore-addons-*.rpm
 ## CONDITIONAL: install ZFS (and sanoid deps)
 if [[ "-zfs" == "${ZFS_TAG}" ]]; then
     rpm-ostree install /tmp/rpms/zfs/*.rpm \
-      perl-Sys-Hostname
+      pv
     # for some reason depmod ran automatically with zfs 2.1 but not with 2.2
     depmod -A ${KERNEL}
 fi