kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #667 from LK4D4/improve_name_gen

Browse source 
Improve name gen
This commit is contained in:
Madhu Venugopal 2015-10-16 12:49:47 -07:00
commit 2509014be8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/Makefile
View file

@ -1,6 +1,6 @@
.PHONY: all all-local build build-local check check-code check-format run-tests check-local integration-tests install-deps coveralls circle-ci start-services clean .PHONY: all all-local build build-local check check-code check-format run-tests check-local integration-tests install-deps coveralls circle-ci start-services clean
SHELL=/bin/bash SHELL=/bin/bash
build_image=libnetwork-build build_image=libnetworkbuild
dockerargs = --privileged -v $(shell pwd):/go/src/github.com/docker/libnetwork -w /go/src/github.com/docker/libnetwork dockerargs = --privileged -v $(shell pwd):/go/src/github.com/docker/libnetwork -w /go/src/github.com/docker/libnetwork
container_env = -e "INSIDECONTAINER=-incontainer=true" container_env = -e "INSIDECONTAINER=-incontainer=true"
docker = docker run --rm -it ${dockerargs} ${container_env} ${build_image} docker = docker run --rm -it ${dockerargs} ${container_env} ${build_image}

4
libnetwork/netutils/utils.go
View file

@ -161,8 +161,8 @@ func GenerateIfaceName(prefix string, len int) (string, error) {
if err != nil { if err != nil {
continue continue
} }
if _, err := net.InterfaceByName(name); err != nil { if _, err := netlink.LinkByName(name); err != nil {
if strings.Contains(err.Error(), "no such") { if strings.Contains(err.Error(), "not found") {
return name, nil return name, nil
} }
return "", err return "", err