summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-08-23 13:40:22 -0400
committerGitHub <noreply@github.com>2021-08-23 13:40:22 -0400
commit062900c264c8228ba660b73a938fcad3b8c28ab8 (patch)
treeefe3da8c6e7454dc4054c6dae97b9a54b146f29b /vendor
parentf9d706bc4982255f40a77ee3dcfb8e3369570ccc (diff)
parentd24a5d9fddb455cd1f4afa0046e30d00271fdd8f (diff)
downloadpodman-062900c264c8228ba660b73a938fcad3b8c28ab8.tar.gz
podman-062900c264c8228ba660b73a938fcad3b8c28ab8.tar.bz2
podman-062900c264c8228ba660b73a938fcad3b8c28ab8.zip
Merge pull request #11309 from containers/dependabot/go_modules/github.com/opencontainers/runc-1.0.2
Bump github.com/opencontainers/runc from 1.0.1 to 1.0.2
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go12
-rw-r--r--vendor/modules.txt2
2 files changed, 13 insertions, 1 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
index a1e7f0afd..5ea9d940c 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
+++ b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
@@ -131,4 +131,16 @@ type Resources struct {
//
// NOTE it is impossible to start a container which has this flag set.
SkipDevices bool `json:"-"`
+
+ // SkipFreezeOnSet is a flag for cgroup manager to skip the cgroup
+ // freeze when setting resources. Only applicable to systemd legacy
+ // (i.e. cgroup v1) manager (which uses freeze by default to avoid
+ // spurious permission errors caused by systemd inability to update
+ // device rules in a non-disruptive manner).
+ //
+ // If not set, a few methods (such as looking into cgroup's
+ // devices.list and querying the systemd unit properties) are used
+ // during Set() to figure out whether the freeze is required. Those
+ // methods may be relatively slow, thus this flag.
+ SkipFreezeOnSet bool `json:"-"`
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 6196ee24f..7d81a84b1 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -506,7 +506,7 @@ github.com/opencontainers/go-digest
# github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
github.com/opencontainers/image-spec/specs-go
github.com/opencontainers/image-spec/specs-go/v1
-# github.com/opencontainers/runc v1.0.1
+# github.com/opencontainers/runc v1.0.2
github.com/opencontainers/runc/libcontainer/apparmor
github.com/opencontainers/runc/libcontainer/cgroups
github.com/opencontainers/runc/libcontainer/configs