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

Merge pull request #4688 from YLonely/master

Browse Source 
bug fix:#4646
This commit is contained in:
Phil Estes 2020-11-03 09:26:32 -05:00 committed by GitHub
commit cb8c09290f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
container_restore_opts.go
View File

@ -87,21 +87,21 @@ func WithRestoreRuntime(ctx context.Context, id string, client *Client, checkpoi
return err return err
} }
} }
var options *ptypes.Any var options ptypes.Any
if m != nil { if m != nil {
store := client.ContentStore() store := client.ContentStore()
data, err := content.ReadBlob(ctx, store, *m) data, err := content.ReadBlob(ctx, store, *m)
if err != nil { if err != nil {
return errors.Wrap(err, "unable to read checkpoint runtime") return errors.Wrap(err, "unable to read checkpoint runtime")
} }
if err := proto.Unmarshal(data, options); err != nil { if err := proto.Unmarshal(data, &options); err != nil {
return err return err
} }
} }
c.Runtime = containers.RuntimeInfo{ c.Runtime = containers.RuntimeInfo{
Name: name, Name: name,
Options: options, Options: &options,
} }
return nil return nil
} }