Merge pull request #8 from citynetwork/bugfix/fedora41

Fix Fedora 41
citynetwork · Nov 7, 2024 · 0c4b45b · 0c4b45b
2 parents 2589499 + 4b357b9
commit 0c4b45b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/bugfix-fedora/root.d/10-fedora-cloud-image b/bugfix-fedora/root.d/10-fedora-cloud-image
@@ -53,7 +53,12 @@ else
     esac
     # We have curl write headers to stderr so that we can debug fedora
     # mirror locations that don't have valid subreleases in their paths.
-    if [[ ${DIB_RELEASE} -ge 40 ]]; then
+    if [[ ${DIB_RELEASE} -ge 41 ]]; then
+        SUBRELEASE_REGEXP=${SUBRELEASE_REGEXP:-'(?<=Fedora-Cloud-Base-Generic-'${DIB_RELEASE}'-).*?(?=\.'${ARCH}'\.qcow2)'}
+        SUBRELEASE=$(head -1 < <(curl -Lis -D /dev/stderr $DIB_CLOUD_IMAGES/ | grep -o -P $SUBRELEASE_REGEXP | sort -r))
+        BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-Fedora-Cloud-Base-Generic-$DIB_RELEASE-$SUBRELEASE.$ARCH.qcow2}
+        BASE_IMAGE_TAR=Fedora-Cloud-Base-Generic-$DIB_RELEASE-$SUBRELEASE.$ARCH.tgz
+    elif [[ ${DIB_RELEASE} -eq 40 ]]; then
         SUBRELEASE_REGEXP=${SUBRELEASE_REGEXP:-'(?<=Fedora-Cloud-Base-Generic\.'${ARCH}'-'${DIB_RELEASE}'-).*?(?=\.qcow2)'}
         SUBRELEASE=$(head -1 < <(curl -Lis -D /dev/stderr $DIB_CLOUD_IMAGES/ | grep -o -P $SUBRELEASE_REGEXP | sort -r))
         BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-Fedora-Cloud-Base-Generic.$ARCH-$DIB_RELEASE-$SUBRELEASE.qcow2}