From d6965a2521b4ade6af70a38062296a12657be286 Mon Sep 17 00:00:00 2001
From: Eric Edens <ericedens@google.com>
Date: Thu, 6 May 2021 18:49:46 +0000
Subject: [PATCH] Use GCE guest environment instead of cloud-init

---
 fedora-cloud-base-gcp.ks | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fedora-cloud-base-gcp.ks b/fedora-cloud-base-gcp.ks
index c7dc4cf..68639ed 100644
--- a/fedora-cloud-base-gcp.ks
+++ b/fedora-cloud-base-gcp.ks
@@ -11,7 +11,14 @@
 # https://cloud.google.com/compute/docs/import/import-existing-image
 bootloader --timeout=0 --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
 
+# redefine `services` here to drop cloud-init systemd unit enablements from
+# fedora-cloud-base.ks since we don't use them.
+services --enabled=sshd
+
 %packages
+# GCP provides its own guest environment.
++google-compute-engine-guest-configs
+-cloud-init
 # Fedora Cloud Base includes the qemu guest agent. GCP prefers
 # that it not be installed  https://pagure.io/cloud-sig/issue/319
 -qemu-guest-agent