Merge branch 'main' into split-zfs

ublue-os · Jul 17, 2024 · 1e76064 · 1e76064
2 parents bc0e8e1 + 08106c1
commit 1e76064
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/build_files/dx/cleanup-dx.sh b/build_files/dx/cleanup-dx.sh
@@ -5,6 +5,7 @@ set -ouex pipefail
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/ublue-os-bling-fedora-"${FEDORA_MAJOR_VERSION}".repo
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/ganto-umoci-fedora-"${FEDORA_MAJOR_VERSION}".repo
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/vscode.repo

diff --git a/build_files/dx/copr-repos-dx.sh b/build_files/dx/copr-repos-dx.sh
@@ -5,6 +5,10 @@ set -ouex pipefail
 #incus, lxc, lxd
 curl -Lo /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
 
+#umoci
+curl -Lo /etc/yum.repos.d/ganto-umoci-fedora-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/ganto/umoci/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-umoci-fedora-"${FEDORA_MAJOR_VERSION}".repo
+
+
 #ublue-os staging
 curl -Lo /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo
 

diff --git a/packages.json b/packages.json
@@ -130,6 +130,7 @@
 				"rocm-opencl",
 				"ubuntu-family-fonts",
 				"udica",
+				"umoci",
 				"virt-manager",
 				"virt-viewer",
 				"ydotool"