opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 01:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod: Make getContainerInspectData work on FreeBSD

Browse Source 
This makes setting EffectiveCaps and BoundingCaps conditional on whether
the capabilites field in the spec is non-nil.  This allows 'podman inspect'
to work on FreeBSD.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-08-31 13:07:53 +01:00
parent 2e4db139ac
commit 45d09e65b8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_inspect.go
View File

@ -158,8 +158,6 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver
Driver: driverData.Name, Driver: driverData.Name,
MountLabel: config.MountLabel, MountLabel: config.MountLabel,
ProcessLabel: config.ProcessLabel, ProcessLabel: config.ProcessLabel,
EffectiveCaps: ctrSpec.Process.Capabilities.Effective,
BoundingCaps: ctrSpec.Process.Capabilities.Bounding,
AppArmorProfile: ctrSpec.Process.ApparmorProfile, AppArmorProfile: ctrSpec.Process.ApparmorProfile,
ExecIDs: execIDs, ExecIDs: execIDs,
GraphDriver: driverData, GraphDriver: driverData,
@ -168,6 +166,10 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver
IsInfra: c.IsInfra(), IsInfra: c.IsInfra(),
IsService: c.IsService(), IsService: c.IsService(),
} }
if ctrSpec.Process.Capabilities != nil {
data.EffectiveCaps = ctrSpec.Process.Capabilities.Effective
data.BoundingCaps = ctrSpec.Process.Capabilities.Bounding
}
if c.state.ConfigPath != "" { if c.state.ConfigPath != "" {
data.OCIConfigPath = c.state.ConfigPath data.OCIConfigPath = c.state.ConfigPath