Merge pull request containers#2670 from giuseppe/runtime-write-rootle…

…ss-conf-before-reload rootless: write the custom config file before reload
baude · Mar 18, 2019 · ea54a1c · ea54a1c
2 parents 310155b + 232b46a
commit ea54a1c
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 40 deletions.
diff --git 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
 }
 

diff --git a/pkg/util/utils.go b/pkg/util/utils.go
@@ -195,7 +195,7 @@ func GetRootlessRuntimeDir() (string, error) {
 		}
 	}
 	if runtimeDir == "" {
-		tmpDir := filepath.Join(os.TempDir(), fmt.Sprintf("libpod-rundir-%s", uid))
+		tmpDir := filepath.Join(os.TempDir(), fmt.Sprintf("run-%s", uid))
 		os.MkdirAll(tmpDir, 0700)
 		st, err := os.Stat(tmpDir)
 		if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && st.Mode().Perm() == 0700 {
@@ -311,36 +311,37 @@ func GetDefaultStoreOptions() (storage.StoreOptions, error) {
 		storageOpts = storage.StoreOptions{}
 		storage.ReloadConfigurationFile(storageConf, &storageOpts)
 	}
-
-	if rootless.IsRootless() {
-		if os.IsNotExist(err) {
-			os.MkdirAll(filepath.Dir(storageConf), 0755)
-			file, err := os.OpenFile(storageConf, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
-			if err != nil {
-				return storageOpts, errors.Wrapf(err, "cannot open %s", storageConf)
-			}
-
-			tomlConfiguration := getTomlStorage(&storageOpts)
-			defer file.Close()
-			enc := toml.NewEncoder(file)
-			if err := enc.Encode(tomlConfiguration); err != nil {
-				os.Remove(storageConf)
-			}
-		} else if err == nil {
-			// If the file did not specify a graphroot or runroot,
-			// set sane defaults so we don't try and use root-owned
-			// directories
-			if storageOpts.RunRoot == "" {
-				storageOpts.RunRoot = defaultRootlessRunRoot
-			}
-			if storageOpts.GraphRoot == "" {
-				storageOpts.GraphRoot = defaultRootlessGraphRoot
-			}
+	if rootless.IsRootless() && err == nil {
+		// If the file did not specify a graphroot or runroot,
+		// set sane defaults so we don't try and use root-owned
+		// directories
+		if storageOpts.RunRoot == "" {
+			storageOpts.RunRoot = defaultRootlessRunRoot
+		}
+		if storageOpts.GraphRoot == "" {
+			storageOpts.GraphRoot = defaultRootlessGraphRoot
 		}
 	}
 	return storageOpts, nil
 }
 
+// WriteStorageConfigFile writes the configuration to a file
+func WriteStorageConfigFile(storageOpts *storage.StoreOptions, storageConf string) error {
+	os.MkdirAll(filepath.Dir(storageConf), 0755)
+	file, err := os.OpenFile(storageConf, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
+	if err != nil {
+		return errors.Wrapf(err, "cannot open %s", storageConf)
+	}
+	tomlConfiguration := getTomlStorage(storageOpts)
+	defer file.Close()
+	enc := toml.NewEncoder(file)
+	if err := enc.Encode(tomlConfiguration); err != nil {
+		os.Remove(storageConf)
+		return err
+	}
+	return nil
+}
+
 // StorageConfigFile returns the path to the storage config file used
 func StorageConfigFile() string {
 	if rootless.IsRootless() {