Merge pull request #2670 from giuseppe/runtime-write-rootless-conf-before-reload

rootless: write the custom config file before reload

1 files changed, 23 insertions, 14 deletions

diff --git a/libpod/runtime.go b/libpod/runtime.go
index 9836b7aab..b3b75d791 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -505,24 +505,33 @@ 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)
-		if err != nil && !os.IsExist(err) {
-			return nil, errors.Wrapf(err, "cannot open file %s", rootlessConfigPath)
+	if rootlessConfigPath != "" {
+		// storage.conf
+		storageConfFile := util.StorageConfigFile()
+		if _, err := os.Stat(storageConfFile); os.IsNotExist(err) {
+			if err := util.WriteStorageConfigFile(&runtime.config.StorageConfig, storageConfFile); err != nil {
+				return nil, errors.Wrapf(err, "cannot write config file %s", storageConfFile)
+			}
 		}
-		if err == nil {
-			defer file.Close()
-			enc := toml.NewEncoder(file)
-			if err := enc.Encode(runtime.config); err != nil {
-				os.Remove(rootlessConfigPath)
+
+		if !foundConfig {
+			os.MkdirAll(filepath.Dir(rootlessConfigPath), 0755)
+			file, err := os.OpenFile(rootlessConfigPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
+			if err != nil && !os.IsExist(err) {
+				return nil, errors.Wrapf(err, "cannot open file %s", rootlessConfigPath)
+			}
+			if err == nil {
+				defer file.Close()
+				enc := toml.NewEncoder(file)
+				if err := enc.Encode(runtime.config); err != nil {
+					os.Remove(rootlessConfigPath)
+				}
 			}
 		}
 	}
+	if err := makeRuntime(runtime); err != nil {
+		return nil, err
+	}
 	return runtime, nil
 }