From 495fd132311ed34c9730f73fa417281ac9be85df Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Tue, 19 Sep 2023 10:56:20 -0600
Subject: [PATCH] Bump to Fedora 39

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 IMG_SFX                          |  2 +-
 IMPORT_IMG_SFX                   |  2 +-
 Makefile                         |  6 +++---
 base_images/fedora_base-setup.sh |  2 +-
 cache_images/fedora_packaging.sh | 16 ++++++++++++++++
 cache_images/rawhide_setup.sh    |  2 +-
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/IMG_SFX b/IMG_SFX
index a3a11294..85b74007 100644
--- a/IMG_SFX
+++ b/IMG_SFX
@@ -1 +1 @@
-20230921t145748z-f38f37d13
+20230926t184634z-f39f38d13
diff --git a/IMPORT_IMG_SFX b/IMPORT_IMG_SFX
index 700099f1..aa1f7087 100644
--- a/IMPORT_IMG_SFX
+++ b/IMPORT_IMG_SFX
@@ -1 +1 @@
-20230816t191121z-f38f37d13
+20230921t135305z-f39f38d13
diff --git a/Makefile b/Makefile
index c3e07d55..073fab56 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,11 @@ if_ci_else = $(if $(findstring true,$(CI)),$(1),$(2))
 
 export CENTOS_STREAM_RELEASE = 8
 
-export FEDORA_RELEASE = 38
-export PRIOR_FEDORA_RELEASE = 37
+export FEDORA_RELEASE = 39
+export PRIOR_FEDORA_RELEASE = 38
 
 # This should always be one-greater than $FEDORA_RELEASE (assuming it's actually the latest)
-export RAWHIDE_RELEASE = 39
+export RAWHIDE_RELEASE = 40
 
 # See import_images/README.md
 export FEDORA_IMPORT_IMG_SFX = $(_IMPORT_IMG_SFX)
diff --git a/base_images/fedora_base-setup.sh b/base_images/fedora_base-setup.sh
index d5406129..c00f7080 100644
--- a/base_images/fedora_base-setup.sh
+++ b/base_images/fedora_base-setup.sh
@@ -30,7 +30,7 @@ if ! ((CONTAINER)); then
         if ((OS_RELEASE_VER<35)); then
             PKGS+=(google-compute-engine-tools)
         else
-            PKGS+=(google-compute-engine-guest-configs)
+            PKGS+=(google-compute-engine-guest-configs google-guest-agent)
         fi
     fi
 fi
diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh
index 682c13cf..bbb2a392 100644
--- a/cache_images/fedora_packaging.sh
+++ b/cache_images/fedora_packaging.sh
@@ -206,6 +206,22 @@ DOWNLOAD_PACKAGES=(\
 msg "Installing general build/test dependencies"
 bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}"
 
+# FIXME: 2023-09-26: emergency upgrade to fix chmod-symlink bug
+if [[ $(date +%Y%m) -gt 202309 ]]; then
+    echo ""
+    echo "FATAL FATAL FATAL: REMOVE THIS TEMPORARY WORKAROUND"
+    echo
+    exit 1
+fi
+source /etc/os-release
+# shellcheck disable=SC2154
+if [[ $VERSION_ID -ge 39 ]]; then
+    arch=$(uname -m)
+    crunrpm=https://kojipkgs.fedoraproject.org//packages/crun/1.9.1/3.fc${VERSION_ID}/${arch}/crun-1.9.1-3.fc${VERSION_ID}.${arch}.rpm
+    msg "FIXME-2023-09-26: installing $crunrpm"
+    bigto $SUDO dnf -y install $crunrpm
+fi
+
 msg "Downloading packages for optional installation at runtime, as needed."
 $SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"
 cd "$PACKAGE_DOWNLOAD_DIR"
diff --git a/cache_images/rawhide_setup.sh b/cache_images/rawhide_setup.sh
index ac128452..58509d1e 100644
--- a/cache_images/rawhide_setup.sh
+++ b/cache_images/rawhide_setup.sh
@@ -17,7 +17,7 @@ source "$REPO_DIRPATH/lib.sh"
 req_env_vars PACKER_BUILD_NAME
 
 # Going from F38 -> rawhide requires some special handling WRT DNF upgrade to DNF5
-if [[ "$OS_RELEASE_VER" -eq 38 ]]; then
+if [[ "$OS_RELEASE_VER" -ge 38 ]]; then
     warn "Upgrading dnf -> dnf5"
     showrun $SUDO dnf update -y dnf
     showrun $SUDO dnf install -y dnf5