diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-09 10:28:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 10:28:24 -0500 |
| commit | 418ab2e5e154cb0df13f2e901cf4aea31a5cd0a9 (patch) | |
| tree | 8eec9ed44001e446dbfb206f9da4d308edfeec5a | |
| parent | ea4248dc26f93bcabaa8a7267bfaf9ee40254666 (diff) | |
| parent | d2f77c256836e8a1a562d56eed7d92fdb18a2f76 (diff) | |
| download | podman-418ab2e5e154cb0df13f2e901cf4aea31a5cd0a9.tar.gz podman-418ab2e5e154cb0df13f2e901cf4aea31a5cd0a9.tar.bz2 podman-418ab2e5e154cb0df13f2e901cf4aea31a5cd0a9.zip | |
Merge pull request #13421 from hshiina/device-rule
Set default rule at the head of device configuration
| -rw-r--r-- | pkg/specgen/generate/oci.go | 6 | ||||
| -rw-r--r-- | test/e2e/run_device_test.go | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 8b3550e36..1cc3a463f 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -332,6 +332,11 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt } // Devices + // set the default rule at the beginning of device configuration + if !inUserNS && !s.Privileged { + g.AddLinuxResourcesDevice(false, "", nil, nil, "rwm") + } + var userDevices []spec.LinuxDevice if s.Privileged { // If privileged, we need to add all the host devices to the @@ -363,7 +368,6 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt // set the devices cgroup when not running in a user namespace if !inUserNS && !s.Privileged { - g.AddLinuxResourcesDevice(false, "", nil, nil, "rwm") for _, dev := range s.DeviceCgroupRule { g.AddLinuxResourcesDevice(true, dev.Type, dev.Major, dev.Minor, dev.Access) } diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index b8bdc84f8..479837dda 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -44,6 +44,11 @@ var _ = Describe("Podman run device", func() { session := podmanTest.Podman([]string{"run", "-q", "--security-opt", "label=disable", "--device", "/dev/kmsg", ALPINE, "test", "-c", "/dev/kmsg"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) + if !isRootless() { + session = podmanTest.Podman([]string{"run", "-q", "--security-opt", "label=disable", "--device", "/dev/kmsg", "--cap-add", "SYS_ADMIN", ALPINE, "head", "-n", "1", "/dev/kmsg"}) + session.WaitWithDefaultTimeout() + Expect(session).Should(Exit(0)) + } }) It("podman run device rename test", func() { |