X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ea6f25f0dde5c750eacea29662c19149c7800134..661483adb0993714e04bff7c1d3efbfa85ca9cca:/lib/boot/cmd.go

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index e0e2755220..963d16226b 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -108,6 +108,12 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
 		fmt.Fprintln(stdout, url)
 		if *shutdown {
 			super.Stop()
+			// Wait for children to exit. Don't report the
+			// ensuing "context cancelled" error, though:
+			// return nil to indicate successful startup.
+			_ = super.Wait()
+			fmt.Fprintln(stderr, "PASS - all services booted successfully")
+			return nil
 		}
 	}
 	// Wait for signal/crash + orderly shutdown