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

Implement init veth creation

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:33:44 -08:00
parent e25ebdd06c
commit 8430fbf11e
6 changed files with 63 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libcontainer/nsinit/init.go
View file

@ -5,7 +5,9 @@ import (
"fmt"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/capabilities"
"github.com/dotcloud/docker/pkg/libcontainer/network"
"github.com/dotcloud/docker/pkg/system"
"io/ioutil"
"log"
"os"
"path/filepath"
@ -50,6 +52,12 @@ func main() {
log.Fatal(err)
}
data, err := ioutil.ReadAll(os.Stdin)
if err != nil {
log.Fatalf("error reading from stdin %s", err)
}
tempVethName := string(data)
// close pipes so that we can replace it with the pty
os.Stdin.Close()
os.Stdout.Close()
@ -81,7 +89,7 @@ func main() {
}
if container.Network != nil {
if err := setupNetworking(container); err != nil {
if err := setupNetworking(container, tempVethName); err != nil {
log.Fatalf("setup networking %s", err)
}
}
@ -166,6 +174,6 @@ func setLogFile(container *libcontainer.Container) error {
return nil
}
func setupNetworking(conatiner *libcontainer.Container) error {
return nil
func setupNetworking(container *libcontainer.Container, tempVethName string) error {
return network.SetupVeth(container.Network, tempVethName)
}