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

vendor latest c/common from main

Browse Source 
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-01-07 13:35:43 +01:00
parent 52b8f6e369
commit 1dbd68f061
81 changed files with 5267 additions and 2135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/github.com/containers/common/libnetwork/netavark/config.go generated vendored
View File

@@ -30,6 +30,9 @@ func sliceRemoveDuplicates(strList []string) []string {
}
func (n *netavarkNetwork) commitNetwork(network *types.Network) error {
if err := os.MkdirAll(n.networkConfigDir, 0o755); err != nil {
return nil
}
confPath := filepath.Join(n.networkConfigDir, network.Name+".json")
f, err := os.Create(confPath)
if err != nil {

19
vendor/github.com/containers/common/libnetwork/netavark/network.go generated vendored
View File

@@ -135,10 +135,6 @@ func NewNetworkInterface(conf *InitConfig) (types.ContainerNetwork, error) {
return nil, fmt.Errorf("failed to parse default subnet: %w", err)
}
if err := os.MkdirAll(conf.NetworkConfigDir, 0o755); err != nil {
return nil, err
}
if err := os.MkdirAll(conf.NetworkRunDir, 0o755); err != nil {
return nil, err
}
@@ -187,6 +183,21 @@ func (n *netavarkNetwork) loadNetworks() error {
// check the mod time of the config dir
f, err := os.Stat(n.networkConfigDir)
if err != nil {
// the directory may not exists which is fine. It will be created on the first network create
if errors.Is(err, os.ErrNotExist) {
// networks are already loaded
if n.networks != nil {
return nil
}
networks := make(map[string]*types.Network, 1)
networkInfo, err := n.createDefaultNetwork()
if err != nil {
return fmt.Errorf("failed to create default network %s: %w", n.defaultNetwork, err)
}
networks[n.defaultNetwork] = networkInfo
n.networks = networks
return nil
}
return err
}
modTime := f.ModTime()