mirror of
https://github.com/containers/podman.git
synced 2025-07-15 03:02:52 +08:00
Update vendor or containers/buildah
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
4
vendor/github.com/containers/common/pkg/config/config_linux.go
generated
vendored
4
vendor/github.com/containers/common/pkg/config/config_linux.go
generated
vendored
@ -23,7 +23,7 @@ func customConfigFile() (string, error) {
|
||||
if path, found := os.LookupEnv("CONTAINERS_CONF"); found {
|
||||
return path, nil
|
||||
}
|
||||
if unshare.IsRootless() {
|
||||
if unshare.GetRootlessUID() > 0 {
|
||||
path, err := rootlessConfigPath()
|
||||
if err != nil {
|
||||
return "", err
|
||||
@ -34,7 +34,7 @@ func customConfigFile() (string, error) {
|
||||
}
|
||||
|
||||
func ifRootlessConfigPath() (string, error) {
|
||||
if unshare.IsRootless() {
|
||||
if unshare.GetRootlessUID() > 0 {
|
||||
path, err := rootlessConfigPath()
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
Reference in New Issue
Block a user