X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/45c57dc86010f8fd9ae862d91a710e0752ceda4a..8145fbe8e6ab99184fcd41dea042ede63e9ff0d5:/lib/boot/cmd.go

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index e0e2755220..001504e203 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -66,6 +66,7 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
 	flags.StringVar(&super.ClusterType, "type", "production", "cluster `type`: development, test, or production")
 	flags.StringVar(&super.ListenHost, "listen-host", "localhost", "host name or interface address for service listeners")
 	flags.StringVar(&super.ControllerAddr, "controller-address", ":0", "desired controller address, `host:port` or `:port`")
+	flags.BoolVar(&super.NoWorkbench1, "no-workbench1", false, "do not run workbench1")
 	flags.BoolVar(&super.OwnTemporaryDatabase, "own-temporary-database", false, "bring up a postgres server and create a temporary database")
 	timeout := flags.Duration("timeout", 0, "maximum time to wait for cluster to be ready")
 	shutdown := flags.Bool("shutdown", false, "shut down when the cluster becomes ready")
@@ -108,6 +109,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