From a1620084c52a1afee55e9eabd7faa30889c8cabc Mon Sep 17 00:00:00 2001 From: Deng Guangxing Date: Fri, 9 Oct 2015 17:55:22 +0800 Subject: [PATCH] remove useless function generateIfaceName() generateIfaceName() is useless as libnetwork has done the job. Signed-off-by: Deng Guangxing --- daemon/execdriver/native/create.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/daemon/execdriver/native/create.go b/daemon/execdriver/native/create.go index 41817b2327..7f7979eb11 100644 --- a/daemon/execdriver/native/create.go +++ b/daemon/execdriver/native/create.go @@ -3,9 +3,7 @@ package native import ( - "errors" "fmt" - "net" "strings" "syscall" @@ -13,7 +11,6 @@ import ( "github.com/opencontainers/runc/libcontainer/apparmor" "github.com/opencontainers/runc/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/devices" - "github.com/opencontainers/runc/libcontainer/utils" ) // createContainer populates and configures the container type with the @@ -103,22 +100,6 @@ func (d *Driver) createContainer(c *execdriver.Command, hooks execdriver.Hooks) return container, nil } -func generateIfaceName() (string, error) { - for i := 0; i < 10; i++ { - name, err := utils.GenerateRandomName("veth", 7) - if err != nil { - continue - } - if _, err := net.InterfaceByName(name); err != nil { - if strings.Contains(err.Error(), "no such") { - return name, nil - } - return "", err - } - } - return "", errors.New("Failed to find name for new interface") -} - func (d *Driver) createNetwork(container *configs.Config, c *execdriver.Command, hooks execdriver.Hooks) error { if c.Network == nil { return nil