Revert "osconfig: enable for TPC."
This reverts commit d3d476f4106ca7b8fe814c48930c3b6ece36b7b2.
Reason for revert: omg/92558
Change-Id: I16d9241b04618020416003c8c838e12ff0d80a96
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/125866
Reviewed-by: Kevin Berry <kpberry@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/app-admin/google-osconfig-agent/files/20241219-google-osconfig-agent-service.patch b/project-lakitu/app-admin/google-osconfig-agent/files/20241219-google-osconfig-agent-service.patch
new file mode 100644
index 0000000..abc6011
--- /dev/null
+++ b/project-lakitu/app-admin/google-osconfig-agent/files/20241219-google-osconfig-agent-service.patch
@@ -0,0 +1,40 @@
+From e3324f82984f9cdcfbd9466322866f94c5c5df90 Mon Sep 17 00:00:00 2001
+From: sejalsharma-google
+ <145373269+sejalsharma-google@users.noreply.github.com>
+Date: Thu, 19 Dec 2024 13:35:49 -0600
+Subject: [PATCH] Update google-osconfig-agent.service for TPC
+
+---
+ google-osconfig-agent.service | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/google-osconfig-agent.service b/google-osconfig-agent.service
+index 448b94ea7d..74acc042f1 100644
+--- a/google-osconfig-agent.service
++++ b/google-osconfig-agent.service
+@@ -1,9 +1,16 @@
+ [Unit]
+ Description=Google OSConfig Agent
+-After=local-fs.target network-online.target
+-Wants=local-fs.target network-online.target
++After=local-fs.target network-online.target get-cloud-api-domains.service
++Wants=local-fs.target network-online.target get-cloud-api-domains.service
++ConditionPathExists=/etc/cloud-api-domains
+
+ [Service]
++ExecCondition=/bin/sh -c 'FILE=/etc/cloud-api-domains; \
++ domain=$(awk -F'\''='\'' '\''/API_DOMAIN/ {print $2}'\'' $FILE); \
++ if [[ $domain != "googleapis.com" ]]; then \
++ echo "osconfig feature is currently unavailable in TPC"; \
++ exit 1; \
++ fi'
+ ExecStart=/usr/bin/google_osconfig_agent
+ Restart=always
+ RestartSec=1
+@@ -13,4 +20,4 @@ KillMode=mixed
+ KillSignal=SIGTERM
+
+ [Install]
+-WantedBy=multi-user.target
+\ No newline at end of file
++WantedBy=multi-user.target
diff --git a/project-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20250520.00-r3.ebuild b/project-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20250520.00-r2.ebuild
similarity index 100%
rename from project-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20250520.00-r3.ebuild
rename to project-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20250520.00-r2.ebuild
diff --git a/project-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20250520.00.ebuild b/project-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20250520.00.ebuild
index ae125eb..a0d5253 100644
--- a/project-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20250520.00.ebuild
+++ b/project-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20250520.00.ebuild
@@ -28,6 +28,10 @@
S="${WORKDIR}/osconfig-${PV}"
+PATCHES=(
+ "${FILESDIR}/20241219-google-osconfig-agent-service.patch"
+)
+
src_compile() {
export GOTRACEBACK="crash"
GO=$(tc-getGO)
