X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/56cc681c50a1463d0128e9e07b5e55265727b567..b532d3105faf4325b47e7bc8ccefd384f960574e:/lib/boot/cmd.go

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index a8aa114de7..4ac6d4a214 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -169,8 +169,8 @@ func (boot *bootCommand) RunCommand(prog string, args []string, stdin io.Reader,
 
 	var wg sync.WaitGroup
 	for _, cmpt := range []component{
-		{name: "controller", cmdArgs: []string{"-config", conffile.Name()}, cmdHandler: controller.Command},
-		{name: "dispatchcloud", cmdArgs: []string{"-config", conffile.Name()}, cmdHandler: dispatchcloud.Command, notIfTest: true},
+		{name: "controller", cmdHandler: controller.Command},
+		{name: "dispatchcloud", cmdHandler: dispatchcloud.Command, notIfTest: true},
 		{name: "keepproxy", goProg: "services/keepproxy"},
 		{name: "railsAPI", svc: cluster.Services.RailsAPI, railsApp: "services/api"},
 	} {
@@ -255,7 +255,6 @@ type component struct {
 	name       string
 	svc        arvados.Service
 	cmdHandler cmd.Handler
-	cmdArgs    []string
 	railsApp   string // source dir in arvados tree, e.g., "services/api"
 	goProg     string // source dir in arvados tree, e.g., "services/keepstore"
 	notIfTest  bool   // don't run this component on a test cluster
@@ -272,7 +271,7 @@ func (cmpt *component) Run(ctx context.Context, boot *bootCommand, stdout, stder
 		errs := make(chan error, 1)
 		go func() {
 			defer close(errs)
-			exitcode := cmpt.cmdHandler.RunCommand(cmpt.name, cmpt.cmdArgs, bytes.NewBuffer(nil), stdout, stderr)
+			exitcode := cmpt.cmdHandler.RunCommand(cmpt.name, nil, bytes.NewBuffer(nil), stdout, stderr)
 			if exitcode != 0 {
 				errs <- fmt.Errorf("exit code %d", exitcode)
 			}