Merge "lakitu: google-osconfig-agent: add a pre-work service"
diff --git a/overlay-lakitu/app-admin/google-osconfig-agent/files/google-osconfig-init.service b/overlay-lakitu/app-admin/google-osconfig-agent/files/google-osconfig-init.service
new file mode 100644
index 0000000..3e2b0c2
--- /dev/null
+++ b/overlay-lakitu/app-admin/google-osconfig-agent/files/google-osconfig-init.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Delete recipe database used by osconfig-agent before it starts
+Before=google-osconfig-agent.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/rm -f /var/lib/google/osconfig_recipedb
+RemainAfterExit=yes
+
+[Install]
+WantedBy=google-osconfig-agent.service
diff --git a/overlay-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20201008.00-r1.ebuild b/overlay-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20201008.00-r2.ebuild
similarity index 100%
rename from overlay-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20201008.00-r1.ebuild
rename to overlay-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20201008.00-r2.ebuild
diff --git a/overlay-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20201008.00.ebuild b/overlay-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20201008.00.ebuild
index 9b19405..984a576 100644
--- a/overlay-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20201008.00.ebuild
+++ b/overlay-lakitu/app-admin/google-osconfig-agent/google-osconfig-agent-20201008.00.ebuild
@@ -635,4 +635,7 @@
 	dobin google_osconfig_agent
 	systemd_dounit google-osconfig-agent.service
 	systemd_enable_service multi-user.target google-osconfig-agent.service
+
+	systemd_dounit "${FILESDIR}"/google-osconfig-init.service
+	systemd_enable_service google-osconfig-agent.service google-osconfig-init.service
 }