From 258a5a173c93dc2c67b33add0ba4e17f399c7464 Mon Sep 17 00:00:00 2001 From: Josh Curl Date: Mon, 29 Aug 2016 15:54:40 -0700 Subject: [PATCH] Modify how /var/lib/rancher/conf/docker is sourced --- cmd/dockerinit/main.go | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/cmd/dockerinit/main.go b/cmd/dockerinit/main.go index aad7814a..47ae56ac 100644 --- a/cmd/dockerinit/main.go +++ b/cmd/dockerinit/main.go @@ -22,12 +22,6 @@ const ( ) func Main() { - if os.Getenv("DOCKER_CONF_SOURCED") == "" { - if err := sourceDockerConf(os.Args); err != nil { - log.Warnf("Failed to source %s: %v", dockerConf, err) - } - } - for { if _, err := os.Stat(consoleDone); err == nil { break @@ -70,16 +64,9 @@ func Main() { } args := []string{ - "dockerlaunch", - dockerBin, - } - - if len(os.Args) > 1 { - args = append(args, os.Args[1:]...) - } - - if os.Getenv("DOCKER_OPTS") != "" { - args = append(args, os.Getenv("DOCKER_OPTS")) + "bash", + "-c", + fmt.Sprintf(`[ -e %s ] && source %s; exec /usr/bin/dockerlaunch %s %s $DOCKER_OPTS >> %s 2>&1`, dockerConf, dockerConf, dockerBin, strings.Join(os.Args[1:], " "), dockerLog), } cfg := config.LoadConfig() @@ -88,16 +75,5 @@ func Main() { log.Error(err) } - log.Fatal(syscall.Exec("/usr/bin/dockerlaunch", args, os.Environ())) -} - -func sourceDockerConf(args []string) error { - args = append([]string{ - "bash", - "-c", - fmt.Sprintf(`[ -e %s ] && source %s; exec docker-init "$@" >> %s 2>&1`, dockerConf, dockerConf, dockerLog), - }, args...) - env := os.Environ() - env = append(env, "DOCKER_CONF_SOURCED=1") - return syscall.Exec("/bin/bash", args, env) + log.Fatal(syscall.Exec("/bin/bash", args, os.Environ())) }