github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Vendor go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7

Browse Source 
This fixes possible panics in Run & Restore when done without IOs

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure
2017-10-18 13:24:12 -07:00
parent 84fa3967c5
commit 90c535521a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/containerd/go-runc/runc.go generated vendored
View File

@@ -243,7 +243,7 @@ func (r *Runc) Run(context context.Context, id, bundle string, opts *CreateOpts)
args = append(args, oargs...)
}
cmd := r.command(context, append(args, id)...)
if opts != nil {
if opts != nil && opts.IO != nil {
opts.Set(cmd)
}
ec, err := Monitor.Start(cmd)
@@ -513,7 +513,7 @@ func (r *Runc) Restore(context context.Context, id, bundle string, opts *Restore
}
args = append(args, "--bundle", bundle)
cmd := r.command(context, append(args, id)...)
if opts != nil {
if opts != nil && opts.IO != nil {
opts.Set(cmd)
}
ec, err := Monitor.Start(cmd)