diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-12 04:59:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 04:59:56 -0700 |
| commit | 1b3dc66e73f97c9f10b3bf203c82556b27a3539c (patch) | |
| tree | e0eaf8048a6750a78d18cf3146333cc060ad20d5 /vendor | |
| parent | 4a1bb394a251598e6414da6d57e36365f5e06f86 (diff) | |
| parent | 7ec6e25aa2fcf8978394acf64b8dc9836ec75bb9 (diff) | |
| download | podman-1b3dc66e73f97c9f10b3bf203c82556b27a3539c.tar.gz podman-1b3dc66e73f97c9f10b3bf203c82556b27a3539c.tar.bz2 podman-1b3dc66e73f97c9f10b3bf203c82556b27a3539c.zip | |
Merge pull request #6175 from vrothberg/1.9-common
[1.9] vendor github.com/containers/common@v0.8.4
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/config.go | 11 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index aa956da04..9613270f1 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -19,12 +19,15 @@ import ( ) const ( + // _configPath is the path to the containers/containers.conf + // inside a given config directory. + _configPath = "containers/containers.conf" // DefaultContainersConfig holds the default containers config path - DefaultContainersConfig = "/usr/share/containers/containers.conf" + DefaultContainersConfig = "/usr/share/" + _configPath // OverrideContainersConfig holds the default config paths overridden by the root user - OverrideContainersConfig = "/etc/containers/containers.conf" + OverrideContainersConfig = "/etc/" + _configPath // UserOverrideContainersConfig holds the containers config path overridden by the rootless user - UserOverrideContainersConfig = ".config/containers/containers.conf" + UserOverrideContainersConfig = ".config/" + _configPath ) // RuntimeStateStore is a constant indicating which state store implementation @@ -844,7 +847,7 @@ func isDirectory(path string) error { func rootlessConfigPath() (string, error) { if configHome := os.Getenv("XDG_CONFIG_HOME"); configHome != "" { - return filepath.Join(configHome, UserOverrideContainersConfig), nil + return filepath.Join(configHome, _configPath), nil } home, err := unshare.HomeDir() if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 80c968ba4..7b247df21 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -82,7 +82,7 @@ github.com/containers/buildah/pkg/secrets github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/pkg/umask github.com/containers/buildah/util -# github.com/containers/common v0.8.3 +# github.com/containers/common v0.8.4 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/capabilities github.com/containers/common/pkg/cgroupv2 |