zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-04-22 23:17:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4636 from lifubang/fix-exec-timens

Browse Source 
libct: don't send config to nsexec when joining an existing timens
This commit is contained in:
Rodrigo Campos
2025-02-26 05:53:29 -03:00
committed by GitHub
parent cfb643e02b ad09197e41
commit 352c8d40ac
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/container_linux.go
+3 -2
View File
@@ -1146,8 +1146,9 @@ func (c *Container) bootstrapData(cloneFlags uintptr, nsMaps map[configs.Namespa
Value: c.config.RootlessEUID,
})
// write boottime and monotonic time ns offsets.
if c.config.TimeOffsets != nil {
// write boottime and monotonic time ns offsets only when we are not joining an existing time ns
_, joinExistingTime := nsMaps[configs.NEWTIME]
if !joinExistingTime && c.config.TimeOffsets != nil {
var offsetSpec bytes.Buffer
for clock, offset := range c.config.TimeOffsets {
fmt.Fprintf(&offsetSpec, "%s %d %d\n", clock, offset.Secs, offset.Nanosecs)