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

Merge pull request #405 from LK4D4/add_default_init 

Add default InitArgs for factory
This commit is contained in:
Michael Crosby 2015-02-25 09:20:35 -08:00
parent c96cde4e5d 8600e6f315
commit 286fffa4ee
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -21,9 +21,7 @@ To use the current binary that is spawning the containers and acting as the pare
you can use `os.Args[0]` and we have a command called `init` setup. you can use `os.Args[0]` and we have a command called `init` setup.
```go ```go
initArgs := []string{os.Args[0], "init"} root, err := libcontainer.New("/var/lib/container", libcontainer.InitArgs(os.Args[0], "init"))
root, err := libcontainer.New("/var/lib/container", initArgs)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

1
factory_linux.go
View File

@ -90,6 +90,7 @@ func New(root string, options ...func(*LinuxFactory) error) (Factory, error) {
Root: root, Root: root,
Validator: validate.New(), Validator: validate.New(),
} }
InitArgs(os.Args[0], "init")(l)
Cgroupfs(l) Cgroupfs(l)
for _, opt := range options { for _, opt := range options {
if err := opt(l); err != nil { if err := opt(l); err != nil {

4
integration/exec_test.go
View File

@ -232,7 +232,7 @@ func TestEnter(t *testing.T) {
config := newTemplateConfig(rootfs) config := newTemplateConfig(rootfs)
factory, err := libcontainer.New(root, libcontainer.InitArgs(os.Args[0], "init", "--"), libcontainer.Cgroupfs) factory, err := libcontainer.New(root, libcontainer.Cgroupfs)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -348,7 +348,7 @@ func TestFreeze(t *testing.T) {
config := newTemplateConfig(rootfs) config := newTemplateConfig(rootfs)
factory, err := libcontainer.New(root, libcontainer.InitArgs(os.Args[0], "init", "--"), libcontainer.Cgroupfs) factory, err := libcontainer.New(root, libcontainer.Cgroupfs)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }