summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/spec/config_linux.go3
-rw-r--r--pkg/spec/spec.go3
2 files changed, 3 insertions, 3 deletions
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
}
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
index 5757a36fe..3634b0b33 100644
--- a/pkg/spec/spec.go
+++ b/pkg/spec/spec.go
@@ -337,9 +337,6 @@ func CreateConfigToOCISpec(config *CreateConfig) (*spec.Spec, error) { //nolint
configSpec.Mounts = mounts
}
- if err := g.SetLinuxRootPropagation("shared"); err != nil {
- return nil, errors.Wrapf(err, "failed to set propagation to rslave")
- }
if canAddResources {
// BLOCK IO
blkio, err := config.CreateBlockIO()