From e4770b82895659278b67a1bddb1a5acd8d785f59 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 17 Sep 2018 15:49:50 -0400 Subject: Small updates to OCI spec generation Firstly, when adding the privileged catch-all resource device, first remove the spec's default catch-all resource device. Second, remove our default rootfs propogation config - Docker does not set this by default, so I don't think we should either. Signed-off-by: Matthew Heon Closes: #1491 Approved by: TomSweeneyRedHat --- pkg/spec/config_linux.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkg/spec/config_linux.go') diff --git a/pkg/spec/config_linux.go b/pkg/spec/config_linux.go index ea04b95bd..6c0a99419 100644 --- a/pkg/spec/config_linux.go +++ b/pkg/spec/config_linux.go @@ -60,6 +60,9 @@ func (c *CreateConfig) addPrivilegedDevices(g *generate.Generator) error { for _, d := range hostDevices { g.AddDevice(Device(d)) } + + // Add resources device - need to clear the existing one first. + g.Spec().Linux.Resources.Devices = nil g.AddLinuxResourcesDevice(true, "", nil, nil, "rwm") return nil } -- cgit v1.2.3-54-g00ecf