Skip to content

Commit

Permalink
fix an override logic in Inherit function
Browse files Browse the repository at this point in the history
Signed-off-by: karta0807913 <[email protected]>
  • Loading branch information
karta0807913 authored Nov 26, 2022
1 parent 4135655 commit 779333e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/specgen/generate/container_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ func Inherit(infra libpod.Container, s *specgen.SpecGenerator, rt *libpod.Runtim
}

// this causes errors when shmSize is the default value, it will still get passed down unless we manually override.
if s.IpcNS.NSMode == specgen.Host && (compatibleOptions.ShmSize != nil && compatibleOptions.IsDefaultShmSize()) {
if inheritSpec.IpcNS.NSMode == specgen.Host && (compatibleOptions.ShmSize != nil && compatibleOptions.IsDefaultShmSize()) {
s.ShmSize = nil
}
return options, infraSpec, compatibleOptions, nil
Expand Down

0 comments on commit 779333e

Please sign in to comment.