Merge pull request #369 from rhatdan/libpod.conf

Remove libpod.conf
containers · Dec 4, 2020 · 38613c8 · 38613c8
2 parents 8a5661c + c3a85d6
commit 38613c8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 412 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -445,11 +445,6 @@ func NewConfig(userConfigPath string) (*Config, error) {
 		return nil, err
 	}
 
-	// read libpod.conf and convert the config to *Config
-	if err = newLibpodConfig(config); err != nil && !os.IsNotExist(err) {
-		logrus.Errorf("error reading libpod.conf: %v", err)
-	}
-
 	// Now, gather the system configs and merge them as needed.
 	configs, err := systemConfigs()
 	if err != nil {