From 8ebed6625b925e1ae5c18b162560f37308335bad Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@tomclegg.ca>
Date: Mon, 24 Feb 2020 15:26:15 -0500
Subject: [PATCH] 15954: Fix error reporting during shutdown.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---
 lib/boot/cmd.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index bf78c42d70..62088a604d 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -528,8 +528,12 @@ func (boot *Booter) RunProgram(ctx context.Context, dir string, output io.Writer
 		return err
 	}
 	err = cmd.Wait()
-	if err != nil && ctx.Err() == nil {
-		// Only report errors that happen before the context ends.
+	if ctx.Err() != nil {
+		// Return "context canceled", instead of the "killed"
+		// error that was probably caused by the context being
+		// canceled.
+		return ctx.Err()
+	} else if err != nil {
 		return fmt.Errorf("%s: error: %v", cmdline, err)
 	}
 	return nil
-- 
2.30.2