From 7efefde3bcb998f37bd2fcde4f004c5bbee13dd5 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 15 Mar 2019 17:05:03 +0100 Subject: rootless: write the custom config file before reload so that when we do a rootlessReload we inherit the correct settings from the command line. Signed-off-by: Giuseppe Scrivano --- libpod/runtime.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libpod/runtime.go b/libpod/runtime.go index 9836b7aab..f7ca6b135 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -505,10 +505,6 @@ func newRuntimeFromConfig(userConfigPath string, options ...RuntimeOption) (runt return nil, errors.Wrapf(err, "error configuring runtime") } } - if err := makeRuntime(runtime); err != nil { - return nil, err - } - if !foundConfig && rootlessConfigPath != "" { os.MkdirAll(filepath.Dir(rootlessConfigPath), 0755) file, err := os.OpenFile(rootlessConfigPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666) @@ -523,6 +519,9 @@ func newRuntimeFromConfig(userConfigPath string, options ...RuntimeOption) (runt } } } + if err := makeRuntime(runtime); err != nil { + return nil, err + } return runtime, nil } -- cgit v1.2.3-54-g00ecf