Call Loader.kernelInitExtra() on restore (earlier called Loader.initDone()).

The kernel init extra function was not being called on restore.

PiperOrigin-RevId: 652026617
This commit is contained in:
Ayush Ranjan
2024-07-13 03:25:37 -07:00
committed by gVisor bot
parent bd9b5a819f
commit 0f9ec81439
3 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -628,7 +628,7 @@ func New(args Args) (*Loader, error) {
enableAutosave(l, args.Conf.TestOnlyAutosaveResume, l.saveFDs)
}
if err := l.initDone(args); err != nil {
if err := l.kernelInitExtra(); err != nil {
return nil, err
}
+4
View File
@@ -276,6 +276,10 @@ func (r *restorer) restore(l *Loader) error {
l.k.RestoreContainerMapping(l.containerIDs)
if err := l.kernelInitExtra(); err != nil {
return err
}
// Refresh the control server with the newly created kernel.
l.ctrl.refreshHandlers()
+1 -1
View File
@@ -42,6 +42,6 @@ func newProcInternalData(*specs.Spec) *proc.InternalData {
return &proc.InternalData{}
}
func (l *Loader) initDone(args Args) error {
func (l *Loader) kernelInitExtra() error {
return nil
}