From 512c7f3aef38c06302d9e56b795976f35e70a4ff Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Mon, 25 Mar 2024 15:43:47 -0700
Subject: [PATCH] Update for f40

---
 .github/workflows/build-iso.yml | 2 +-
 build.sh                        | 8 ++++----
 fedora-kickstarts               | 2 +-
 t2linux-fedora-common.ks        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml
index f5ec7df6..d68fc924 100644
--- a/.github/workflows/build-iso.yml
+++ b/.github/workflows/build-iso.yml
@@ -37,7 +37,7 @@ jobs:
           docker run \
             --privileged \
             -v "$PWD":/repo \
-            ghcr.io/t2linux/fedora-dev:latest \
+            ghcr.io/t2linux/fedora-dev:40 \
             /repo/build.sh
 
       - name: Upload Artifact
diff --git a/build.sh b/build.sh
index d65ceff0..1aa0e9c3 100755
--- a/build.sh
+++ b/build.sh
@@ -14,17 +14,17 @@ for ks in "${kickstarts[@]}"; do
     ks_builddir="$builddir/$ks"; mkdir -p $ks_builddir; cd "$ks_builddir"
     cp -r /repo/fedora-kickstarts/* .; cp -f /repo/*.ks .
     echo '%include t2linux-fedora-common.ks' >> "$ks.ks"
-    sudo ksflatten --config "$ks.ks" --output "$ks-flat.ks" --version F39
+    sudo ksflatten --config "$ks.ks" --output "$ks-flat.ks" --version F40
     livemedia-creator \
         --make-iso \
         --iso-only \
         --no-virt \
         --resultdir results \
-        --releasever 39 \
+        --releasever 40 \
         --ks "$ks-flat.ks" \
         --project t2linux-Fedora-Live \
-        --volid t2linux-Fedora-Live-39 \
-        --iso-name "t2linux-$ks-39.iso"
+        --volid t2linux-Fedora-Live-40 \
+        --iso-name "t2linux-$ks-40.iso"
     find results/*.iso -size +2G -exec sh -c "split -b 1999M -x {} {}. && rm {}" \;
     mv results/* /repo/builddir/iso/
 done
diff --git a/fedora-kickstarts b/fedora-kickstarts
index 465debb7..f9ac9f9d 160000
--- a/fedora-kickstarts
+++ b/fedora-kickstarts
@@ -1 +1 @@
-Subproject commit 465debb7c90c8ab4c68e14ff48fe50f796b1c089
+Subproject commit f9ac9f9ddce7ae33aa74893bc1560a69eb48d115
diff --git a/t2linux-fedora-common.ks b/t2linux-fedora-common.ks
index 2cdf6976..0b3d3203 100644
--- a/t2linux-fedora-common.ks
+++ b/t2linux-fedora-common.ks
@@ -1,6 +1,6 @@
-repo --name=tmp-t2linux  --cost=98 --baseurl=https://download.copr.fedorainfracloud.org/results/sharpenedblade/t2linux/fedora-$releasever-$basearch/
+repo --name="copr_copr.fedorainfracloud.org_sharpenedblade_t2linux" --cost=80 --baseurl=https://download.copr.fedorainfracloud.org/results/sharpenedblade/t2linux/fedora-$releasever-$basearch/
 
-bootloader --append="intel_iommu=on iommu=pt"
+bootloader --append="intel_iommu=on iommu=pt mem_sleep=s2idle"
 
 %packages