jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nsinit: add getContainer() 

Signed-off-by: Andrey Vagin <avagin@openvz.org>
This commit is contained in:
Andrey Vagin 2015-01-13 14:49:46 +03:00 committed by Andrew Vagin
parent 6dd7552537
commit 59e66b818d
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nsinit/exec.go
View File

@ -28,17 +28,7 @@ var execCommand = cli.Command{
}, },
} }
func execAction(context *cli.Context) { func getContainer(context *cli.Context) (libcontainer.Container, error) {
var exitCode int
process := &libcontainer.ProcessConfig{
Args: context.Args(),
Env: context.StringSlice("env"),
Stdin: os.Stdin,
Stdout: os.Stdout,
Stderr: os.Stderr,
}
factory, err := libcontainer.New(context.GlobalString("root"), []string{os.Args[0], "init", "--fd", "3", "--"}) factory, err := libcontainer.New(context.GlobalString("root"), []string{os.Args[0], "init", "--fd", "3", "--"})
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@ -55,6 +45,22 @@ func execAction(context *cli.Context) {
} }
container, err = factory.Create(id, config) container, err = factory.Create(id, config)
} }
return container, err
}
func execAction(context *cli.Context) {
var exitCode int
process := &libcontainer.ProcessConfig{
Args: context.Args(),
Env: context.StringSlice("env"),
Stdin: os.Stdin,
Stdout: os.Stdout,
Stderr: os.Stderr,
}
container, err := getContainer(context)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }