From 3e4eeb7d370ebe8cbdd1c237e43e3a438910fca5 Mon Sep 17 00:00:00 2001
From: "Jean (east-high-Nerd)" <jean@easthighnerd.net>
Date: Wed, 24 Dec 2025 16:34:29 -0500
Subject: [PATCH] Split off more Fedora-related tasks into 'fedora.sh'

---
 fedora.sh   | 28 +++++++++++++++++++++++++++-
 pre-inst.sh | 26 +-------------------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/fedora.sh b/fedora.sh
index 72a91a1..b7066bd 100755
--- a/fedora.sh
+++ b/fedora.sh
@@ -9,7 +9,33 @@ source \
 	"${baseDir}/system.conf"
 
 
-if [[ "${1}" == '--rsync' ]]; then
+if [[ "${1}" == '--live' ]]; then
+	if [[ "${VERSION_ID}" -lt '41' ]]; then
+		dnf config-manager \
+			--disable \
+			updates
+	else
+		dnf config-manager \
+			setopt \
+			updates.enabled=0
+	fi
+
+	dnf install \
+		-y \
+		https://zfsonlinux.org/fedora/zfs-release-${zolFedoraVer}$(rpm --eval "%{dist}").noarch.rpm
+
+	dnf install \
+		-y \
+		https://dl.fedoraproject.org/pub/fedora/linux/releases/${VERSION_ID}/Everything/x86_64/os/Packages/k/kernel-devel-$(uname -r).rpm
+
+	dnf install \
+		-y \
+		zfs \
+		gdisk
+
+	modprobe \
+		zfs
+elif [[ "${1}" == '--rsync' ]]; then
 	mkdir -p /run/install
 
 	if [[ "${VERSION_ID}" -lt '41' ]]; then
diff --git a/pre-inst.sh b/pre-inst.sh
index d6fe88a..091faa9 100755
--- a/pre-inst.sh
+++ b/pre-inst.sh
@@ -42,31 +42,7 @@ fi
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
 	"${baseDir}/debian.sh" --live
 elif [[ "${ID}" == 'fedora' ]]; then
-	if [[ "${VERSION_ID}" -lt '41' ]]; then
-		dnf config-manager \
-			--disable \
-			updates
-	else
-		dnf config-manager \
-			setopt \
-			updates.enabled=0
-	fi
-
-	dnf install \
-		-y \
-		https://zfsonlinux.org/fedora/zfs-release-${zolFedoraVer}$(rpm --eval "%{dist}").noarch.rpm
-
-	dnf install \
-		-y \
-		https://dl.fedoraproject.org/pub/fedora/linux/releases/${VERSION_ID}/Everything/x86_64/os/Packages/k/kernel-devel-$(uname -r).rpm
-
-	dnf install \
-		-y \
-		zfs \
-		gdisk
-
-	modprobe \
-		zfs
+	"${baseDir}/fedora.sh" --live
 fi
 
 timedatectl