16306: Exit 0 when startup-then-shutdown goes as planned.

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

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index e0e2755220a1ec3bbdb8737067c54a579209f40e..373613bb35d7c30d5803df0e6b6cc4b02cf4f410 100644 (file)
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -108,6 +108,11 @@ 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()
+                       return nil
                }
        }
        // Wait for signal/crash + orderly shutdown