containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1169 from n1hility/win-regression 

Fix Windows regression introduced by PR #1161
This commit is contained in:
OpenShift Merge Robot 2022-09-30 09:51:37 +02:00 committed by GitHub
parent 3c0d457a06 45154dcc7e
commit 43dece9721
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/pkg/config/default.go
View File

@ -180,7 +180,7 @@ func DefaultConfig() (*Config, error) {
} }
defaultEngineConfig.SignaturePolicyPath = DefaultSignaturePolicyPath defaultEngineConfig.SignaturePolicyPath = DefaultSignaturePolicyPath
if unshare.GetRootlessUID() > 0 { if useUserConfigLocations() {
configHome, err := homedir.GetConfigHome() configHome, err := homedir.GetConfigHome()
if err != nil { if err != nil {
return nil, err return nil, err
@ -289,7 +289,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
return nil, err return nil, err
} }
} }
storeOpts, err := types.DefaultStoreOptions(unshare.GetRootlessUID() > 0, unshare.GetRootlessUID()) storeOpts, err := types.DefaultStoreOptions(useUserConfigLocations(), unshare.GetRootlessUID())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -427,7 +427,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
} }
func defaultTmpDir() (string, error) { func defaultTmpDir() (string, error) {
if unshare.GetRootlessUID() == 0 { if !useUserConfigLocations() {
return getLibpodTmpDir(), nil return getLibpodTmpDir(), nil
} }
@ -679,3 +679,10 @@ func getDefaultSSHConfig() string {
dirname := homedir.Get() dirname := homedir.Get()
return filepath.Join(dirname, ".ssh", "config") return filepath.Join(dirname, ".ssh", "config")
} }
func useUserConfigLocations() bool {
// NOTE: For now we want Windows to use system locations.
// GetRootlessUID == -1 on Windows, so exclude negative range
return unshare.GetRootlessUID() > 0
}