From a7d8c732b1760fcb3d5fb99c035a34123809e9cd Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Wed, 30 Jul 2014 06:44:34 +0000 Subject: [PATCH] Move TMPDIR symlink cleanup to NewDaemon Docker-DCO-1.1-Signed-off-by: Solomon Hykes (github: shykes) --- daemon/daemon.go | 7 +++++++ docker/docker.go | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 0dc5470044..fa8f9685b0 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -767,6 +767,13 @@ func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*D if os.Geteuid() != 0 { log.Fatalf("The Docker daemon needs to be run as root") } + // set up the TempDir to use a canonical path + tmp := os.TempDir() + realTmp, err := utils.ReadSymlinkedDirectory(tmp) + if err != nil { + log.Fatalf("Unable to get the full path to the TempDir (%s): %s", tmp, err) + } + os.Setenv("TMPDIR", realTmp) if !config.EnableSelinuxSupport { selinuxSetDisabled() } diff --git a/docker/docker.go b/docker/docker.go index 5719d6bb2a..09862e6879 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -119,13 +119,6 @@ func main() { return } - // set up the TempDir to use a canonical path - tmp := os.TempDir() - realTmp, err := utils.ReadSymlinkedDirectory(tmp) - if err != nil { - log.Fatalf("Unable to get the full path to the TempDir (%s): %s", tmp, err) - } - os.Setenv("TMPDIR", realTmp) // get the canonical path to the Docker root directory root := *flRoot