From 91105f81452f12e9dcf95a6dab78c838726c51e7 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Tue, 20 Jan 2026 21:41:00 +0700 Subject: all: add custom instance configs In the instance_configs.cfg.distro, we disable cloud logging to prevent duplicate logs and disable boto config at boot. Most distro disable boto config by default. --- .SRCINFO | 8 +++++--- PKGBUILD | 7 +++++-- instance_configs.cfg.distro | 11 +++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 instance_configs.cfg.distro diff --git a/.SRCINFO b/.SRCINFO index b0e6da2..481c97b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = google-guest-agent pkgdesc = Guest Agent for Google Compute Engine - pkgver = 20251223.00 + pkgver = 20260115.01 pkgrel = 1 url = https://github.com/GoogleCloudPlatform/guest-agent install = google-guest-agent.install @@ -8,9 +8,11 @@ pkgbase = google-guest-agent license = Apache-2.0 makedepends = go backup = etc/default/instance_configs.cfg - source = guest-agent-20251223.00.tar.gz::https://github.com/GoogleCloudPlatform/guest-agent/archive/20251223.00.tar.gz + source = guest-agent-20260115.01.tar.gz::https://github.com/GoogleCloudPlatform/guest-agent/archive/20260115.01.tar.gz source = google-guest-agent.install - sha256sums = a6d4ed1398fc9d7de5d98df0da229888def14a75c1b74084df36d63881de4064 + source = instance_configs.cfg.distro + sha256sums = fe1790291ab1d96706e1438ca5f14fa752d17714753de5f5e06ed7511f7b43a5 sha256sums = 6aaf5ed980eda8695723d85e204569b50789b5200296714a8f674dc3f67ca532 + sha256sums = 20926b120d9d4d7819000ae94e50d7fd57c61cc15c29bb075c01475f5d9f5cc9 pkgname = google-guest-agent diff --git a/PKGBUILD b/PKGBUILD index 586fb21..deb4ad6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,7 +18,7 @@ pkgname='google-guest-agent' _pkgname='guest-agent' -pkgver=20251223.00 +pkgver=20260115.01 pkgrel=1 pkgdesc='Guest Agent for Google Compute Engine' arch=('x86_64') @@ -28,10 +28,12 @@ makedepends=('go') source=( "$_pkgname-$pkgver.tar.gz::https://github.com/GoogleCloudPlatform/guest-agent/archive/$pkgver.tar.gz" 'google-guest-agent.install' + 'instance_configs.cfg.distro' ) sha256sums=( - 'a6d4ed1398fc9d7de5d98df0da229888def14a75c1b74084df36d63881de4064' + 'fe1790291ab1d96706e1438ca5f14fa752d17714753de5f5e06ed7511f7b43a5' '6aaf5ed980eda8695723d85e204569b50789b5200296714a8f674dc3f67ca532' + '20926b120d9d4d7819000ae94e50d7fd57c61cc15c29bb075c01475f5d9f5cc9' ) install='google-guest-agent.install' backup=('etc/default/instance_configs.cfg') @@ -55,6 +57,7 @@ package() { install -d $pkgdir/etc/default/ install -p -m=0644 instance_configs.cfg $pkgdir/etc/default/ + install -p -m=0644 $srcdir/instance_configs.cfg.distro $pkgdir/etc/default/ install -d $pkgdir/usr/bin/ install -p -m=0755 google_guest_agent/google_guest_agent \ diff --git a/instance_configs.cfg.distro b/instance_configs.cfg.distro new file mode 100644 index 0000000..038464c --- /dev/null +++ b/instance_configs.cfg.distro @@ -0,0 +1,11 @@ +[Core] +# Prevent duplicate log in Logs Explorer. +# The ops-agent, that consume systemd journal, will forward the logs. +cloud_logging_enabled = false + +[InstanceSetup] +# Skip creating the boto config for using Google Cloud Storage. +# Most of enteprise distro disable it [1]. +# +# [1]: https://github.com/GoogleCloudPlatform/compute-image-tools/blob/e1b3a5f6e81eab3e79b332975c1a4eb0ee7ead54/daisy_workflows/image_build/enterprise_linux/kickstart/rhel_10.cfg +set_boto_config = false -- cgit v1.3