zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-10-05 15:37:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4696 from avagin/criu-vs-exec

Browse Source 
criu: Add time namespace to container config after checkpoint/restore
This commit is contained in:
Rodrigo Campos
2025-04-01 14:54:33 -03:00
committed by GitHub
parent f88669c0c9 b68cbdff34
commit c3a41d77db
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libcontainer/criu_linux.go
View File

@@ -1151,6 +1151,13 @@ func (c *Container) criuNotifications(resp *criurpc.CriuResp, process *Process,
}
// create a timestamp indicating when the restored checkpoint was started
c.created = time.Now().UTC()
if !c.config.Namespaces.Contains(configs.NEWTIME) &&
configs.IsNamespaceSupported(configs.NEWTIME) &&
c.checkCriuVersion(31400) == nil {
// CRIU restores processes into a time namespace.
c.config.Namespaces = append(c.config.Namespaces,
configs.Namespace{Type: configs.NEWTIME})
}
if _, err := c.updateState(r); err != nil {
return err
}