| commit | 4896c65d9d3f3f2df90766ba02693323424d736e | [log] [tgz] |
|---|---|---|
| author | Roy Yang <royyang@google.com> | Wed Mar 10 13:41:44 2021 -0800 |
| committer | Roy Yang <royyang@google.com> | Mon Mar 15 16:44:19 2021 +0000 |
| tree | ab670937ab344ffdf454eb507f5d367480889b7c | |
| parent | 0828df3ccb82ff4712f15219a7966436f2b95af8 [diff] |
lakitu: make google-guest-agent part of systemd-networkd BUG=b/181332341 TEST=presubmit RELEASE_NOTE=None Change-Id: If697686026decd8de71de4293834bdc637af7219 Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/14030 Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com> Reviewed-by: Dexter Rivera <riverade@google.com>
diff --git a/project-lakitu/app-admin/google-guest-agent/files/0001-Make-this-part-of-systemd-networkd-service-for-COS.patch b/project-lakitu/app-admin/google-guest-agent/files/0001-Make-this-part-of-systemd-networkd-service-for-COS.patch new file mode 100644 index 0000000..5fe3711 --- /dev/null +++ b/project-lakitu/app-admin/google-guest-agent/files/0001-Make-this-part-of-systemd-networkd-service-for-COS.patch
@@ -0,0 +1,28 @@ +From 0d140a51a66b003803f46277aafa3cab629349f1 Mon Sep 17 00:00:00 2001 +From: Roy Yang <royyang@google.com> +Date: Tue, 9 Mar 2021 12:27:50 -0800 +Subject: [PATCH] Make this part of systemd-networkd service for COS + +BUG=b: +TEST=None +RELEASE_NOTE=None +--- + google-guest-agent.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/google-guest-agent.service b/google-guest-agent.service +index 05fbf12..fd027cc 100644 +--- a/google-guest-agent.service ++++ b/google-guest-agent.service +@@ -4,7 +4,7 @@ Before=sshd.service + After=network-online.target rsyslog.service network.service networking.service + After=NetworkManager.service + Wants=network-online.target +-PartOf=network.service networking.service NetworkManager.service ++PartOf=systemd-networkd.service network.service networking.service NetworkManager.service + + [Service] + Type=simple +-- +2.30.1.766.gb4fecdf3b7-goog +
diff --git a/project-lakitu/app-admin/google-guest-agent/google-guest-agent-20201102.00-r1.ebuild b/project-lakitu/app-admin/google-guest-agent/google-guest-agent-20201102.00-r2.ebuild similarity index 100% rename from project-lakitu/app-admin/google-guest-agent/google-guest-agent-20201102.00-r1.ebuild rename to project-lakitu/app-admin/google-guest-agent/google-guest-agent-20201102.00-r2.ebuild
diff --git a/project-lakitu/app-admin/google-guest-agent/google-guest-agent-20201102.00.ebuild b/project-lakitu/app-admin/google-guest-agent/google-guest-agent-20201102.00.ebuild index 7c6a824..7921157 100644 --- a/project-lakitu/app-admin/google-guest-agent/google-guest-agent-20201102.00.ebuild +++ b/project-lakitu/app-admin/google-guest-agent/google-guest-agent-20201102.00.ebuild
@@ -341,6 +341,10 @@ S=${WORKDIR}/guest-agent-${PV} +PATCHES=( + "${FILESDIR}/0001-Make-this-part-of-systemd-networkd-service-for-COS.patch" +) + src_compile() { export GOTRACEBACK="crash" GO=$(tc-getGO)