From 1917992733f0a467cd068bedfa236efd6f4c37bc Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 28 Dec 2020 15:21:04 -0500 Subject: [PATCH] 17175: Fix logging label for setuidgid-wrapped procs. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/boot/supervisor.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go index 1e8e83ff3b..a85a699c3c 100644 --- a/lib/boot/supervisor.go +++ b/lib/boot/supervisor.go @@ -451,8 +451,8 @@ func (super *Supervisor) RunProgram(ctx context.Context, dir string, output io.W super.logger.WithField("command", cmdline).WithField("dir", dir).Info("executing") logprefix := prog - if logprefix == "setuidgid" && len(args) >= 3 { - logprefix = args[2] + if logprefix == "setuidgid" && len(args) >= 2 { + logprefix = args[1] } logprefix = strings.TrimPrefix(logprefix, super.tempdir+"/bin/") if logprefix == "bundle" && len(args) > 2 && args[0] == "exec" { -- 2.30.2