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 #80 from QiWang19/rm_cgroup_check 

remove CgroupsAndAdjust from NewConfig
This commit is contained in:
Daniel J Walsh 2020-03-09 16:59:22 -04:00 committed by GitHub
parent 7508a6e72d eee0f4f7f8
commit 66647dd5c2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/pkg/config/config.go
View File

@ -422,7 +422,6 @@ func NewConfig(userConfigPath string) (*Config, error) {
logrus.Debugf("Merged system config %q: %v", path, config) logrus.Debugf("Merged system config %q: %v", path, config)
} }
config.checkCgroupsAndAdjustConfig()
config.addCAPPrefix() config.addCAPPrefix()
if err := config.Validate(); err != nil { if err := config.Validate(); err != nil {
@ -485,10 +484,10 @@ func systemConfigs() ([]string, error) {
return configs, nil return configs, nil
} }
// checkCgroupsAndAdjustConfig checks if we're running rootless with the systemd // CheckCgroupsAndAdjustConfig checks if we're running rootless with the systemd
// cgroup manager. In case the user session isn't available, we're switching the // cgroup manager. In case the user session isn't available, we're switching the
// cgroup manager to cgroupfs. Note, this only applies to rootless. // cgroup manager to cgroupfs. Note, this only applies to rootless.
func (c *Config) checkCgroupsAndAdjustConfig() { func (c *Config) CheckCgroupsAndAdjustConfig() {
if !unshare.IsRootless() || c.Libpod.CgroupManager != SystemdCgroupsManager { if !unshare.IsRootless() || c.Libpod.CgroupManager != SystemdCgroupsManager {
return return
} }