mirror of
https://github.com/containers/podman.git
synced 2025-12-03 11:49:18 +08:00
vendor: update c/{common, image, storage} to latest main
Just to make sure everything still works ahead of monorepo move. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
4
vendor/github.com/containers/common/pkg/config/config_unix.go
generated
vendored
4
vendor/github.com/containers/common/pkg/config/config_unix.go
generated
vendored
@@ -25,11 +25,11 @@ func userConfigPath() (string, error) {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return filepath.Join(home, UserOverrideContainersConfig), nil
|
||||
return filepath.Join(home, userOverrideContainersConfig), nil
|
||||
}
|
||||
|
||||
// overrideContainersConfigPath returns the default config path overridden
|
||||
// by the root user
|
||||
func overrideContainersConfigPath() (string, error) {
|
||||
return OverrideContainersConfig, nil
|
||||
return overrideContainersConfig, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user