vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Add dynamic veth name

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-02-19 15:54:53 -08:00
parent 8430fbf11e
commit ab6864d0c0
4 changed files with 48 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libcontainer/nsinit/exec.go
View file

@ -4,6 +4,7 @@ import (
"fmt"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/network"
"github.com/dotcloud/docker/pkg/libcontainer/utils"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/pkg/term"
"io"
@ -105,7 +106,14 @@ func createMasterAndConsole() (*os.File, string, error) {
}
func createVethPair() (name1 string, name2 string, err error) {
name1, name2 = "veth001", "veth002"
name1, err = utils.GenerateRandomName("dock", 4)
if err != nil {
return
}
name2, err = utils.GenerateRandomName("dock", 4)
if err != nil {
return
}
if err = network.CreateVethPair(name1, name2); err != nil {
return
}