From: Tom Clegg <tom@curii.com>
Date: Thu, 30 Jun 2022 19:11:32 +0000 (-0400)
Subject: 16552: Fix warnings re wrong process signalling service readiness.
X-Git-Tag: 2.5.0~116^2~14
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/de4f7a1ed61ed17a961732668a2c5957130d4740

16552: Fix warnings re wrong process signalling service readiness.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/boot/service.go b/lib/boot/service.go
index b27a746228..506407f4e8 100644
--- a/lib/boot/service.go
+++ b/lib/boot/service.go
@@ -47,7 +47,15 @@ func (runner runServiceCommand) Run(ctx context.Context, fail func(error), super
 		super.waitShutdown.Add(1)
 		go func() {
 			defer super.waitShutdown.Done()
-			fail(super.RunProgram(ctx, super.tempdir, runOptions{env: []string{"ARVADOS_SERVICE_INTERNAL_URL=" + u.String()}}, binfile, runner.name, "-config", super.configfile))
+			fail(super.RunProgram(ctx, super.tempdir, runOptions{
+				env: []string{
+					"ARVADOS_SERVICE_INTERNAL_URL=" + u.String(),
+					// Child process should not
+					// try to tell systemd that we
+					// are ready.
+					"NOTIFY_SOCKET=",
+				},
+			}, binfile, runner.name, "-config", super.configfile))
 		}()
 	}
 	return nil