opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-09 07:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

update c/common to latest main

Browse Source 
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-02-07 10:59:33 +01:00
parent cb1bac7331
commit ef8e63cb29
50 changed files with 336 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/containers/common/pkg/config/connections.go generated vendored
View File

@@ -11,7 +11,7 @@ import (
"github.com/containers/storage/pkg/ioutils"
)
const connectionsFile = "podman-connections.conf"
const connectionsFile = "podman-connections.json"
// connectionsConfigFile returns the path to the rw connections config file
func connectionsConfigFile() (string, error) {

18
vendor/github.com/containers/common/pkg/config/new.go generated vendored
View File

@@ -78,19 +78,8 @@ func newLocked(options *Options) (*Config, error) {
if err != nil {
return nil, fmt.Errorf("finding config on system: %w", err)
}
// connectionsPath, err := connectionsConfigFile()
// if err != nil {
// return nil, err
// }
for _, path := range configs {
// var dests []*Destination
// if path == connectionsPath {
// // Store the dest pointers so we know after the load if there are new pointers
// // the connection changed and thus is read write.
// dests = maps.Values(config.Engine.ServiceDestinations)
// }
// Merge changes in later configs with the previous configs.
// Each config file that specified fields, will override the
// previous fields.
@@ -99,13 +88,6 @@ func newLocked(options *Options) (*Config, error) {
}
logrus.Debugf("Merged system config %q", path)
logrus.Tracef("%+v", config)
// // if there is a new dest now we know it is read write as it was in the connections.conf file
// for _, dest := range config.Engine.ServiceDestinations {
// if !slices.Contains(dests, dest) {
// dest.ReadWrite = true
// }
// }
}
modules, err := options.modules()