From 41f69883d25cc62ae2fb1efdf79f2e7df539c56a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Jun 2015 14:53:18 +0200 Subject: [PATCH] tempDir (in the root dir), must be created after the root dir. Signed-off-by: mikael.davranche --- daemon/daemon.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 60d45b6a80..529c599992 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -608,17 +608,6 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo // set up SIGUSR1 handler to dump Go routine stacks setupSigusr1Trap() - // set up the tmpDir to use a canonical path - tmp, err := tempDir(config.Root) - if err != nil { - return nil, fmt.Errorf("Unable to get the TempDir under %s: %s", config.Root, err) - } - realTmp, err := fileutils.ReadSymlinkedDirectory(tmp) - if err != nil { - return nil, fmt.Errorf("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 var realRoot string if _, err := os.Stat(config.Root); err != nil && os.IsNotExist(err) { @@ -635,6 +624,17 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo return nil, err } + // set up the tmpDir to use a canonical path + tmp, err := tempDir(config.Root) + if err != nil { + return nil, fmt.Errorf("Unable to get the TempDir under %s: %s", config.Root, err) + } + realTmp, err := fileutils.ReadSymlinkedDirectory(tmp) + if err != nil { + return nil, fmt.Errorf("Unable to get the full path to the TempDir (%s): %s", tmp, err) + } + os.Setenv("TMPDIR", realTmp) + // Set the default driver graphdriver.DefaultDriver = config.GraphDriver