diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-15 07:39:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 07:39:35 -0700 |
| commit | d5358e676486bf894eadffd0b55c7e5d6a35867b (patch) | |
| tree | 2fc9a8895354efbd118b3a02d6e8b362726046f2 /pkg/network/devices.go | |
| parent | a88cd9a22e5440532519f8ce6746738464f499e5 (diff) | |
| parent | 48d83482db11d1ea3432520035cc457dc659c9a9 (diff) | |
| download | podman-d5358e676486bf894eadffd0b55c7e5d6a35867b.tar.gz podman-d5358e676486bf894eadffd0b55c7e5d6a35867b.tar.bz2 podman-d5358e676486bf894eadffd0b55c7e5d6a35867b.zip | |
Merge pull request #6215 from maxm123/master
Use the containers.conf cni_config_dir option for inspect and delete
Diffstat (limited to 'pkg/network/devices.go')
| -rw-r--r-- | pkg/network/devices.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/network/devices.go b/pkg/network/devices.go index 78e1a5aa5..8eac32142 100644 --- a/pkg/network/devices.go +++ b/pkg/network/devices.go @@ -4,6 +4,7 @@ import ( "fmt" "os/exec" + "github.com/containers/common/pkg/config" "github.com/containers/libpod/pkg/util" "github.com/containers/libpod/utils" "github.com/sirupsen/logrus" @@ -11,12 +12,12 @@ import ( // GetFreeDeviceName returns a device name that is unused; used when no network // name is provided by user -func GetFreeDeviceName() (string, error) { +func GetFreeDeviceName(config *config.Config) (string, error) { var ( deviceNum uint deviceName string ) - networkNames, err := GetNetworkNamesFromFileSystem() + networkNames, err := GetNetworkNamesFromFileSystem(config) if err != nil { return "", err } @@ -24,7 +25,7 @@ func GetFreeDeviceName() (string, error) { if err != nil { return "", err } - bridgeNames, err := GetBridgeNamesFromFileSystem() + bridgeNames, err := GetBridgeNamesFromFileSystem(config) if err != nil { return "", err } |