diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-08 10:42:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 10:42:44 -0400 |
| commit | cdbc33112ef6407db1292f0a40778e6ac1d8996e (patch) | |
| tree | 071c7cc2744f62d007ee16419307932acb5e100a /vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go | |
| parent | 0c9c3e6714905fbb493e0b634e09b56ae096592e (diff) | |
| parent | dc17195bd9d1027b19c3e7f0975f17f4ebda408a (diff) | |
| download | podman-cdbc33112ef6407db1292f0a40778e6ac1d8996e.tar.gz podman-cdbc33112ef6407db1292f0a40778e6ac1d8996e.tar.bz2 podman-cdbc33112ef6407db1292f0a40778e6ac1d8996e.zip | |
Merge pull request #13687 from rhatdan/VENDOR
Vendor in new opencontainers/selinux
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go')
| -rw-r--r-- | vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go index 13ebf52ab..b32af4ee5 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go @@ -55,12 +55,12 @@ func IsCgroup2HybridMode() bool { var st unix.Statfs_t err := unix.Statfs(hybridMountpoint, &st) if err != nil { - if os.IsNotExist(err) { - // ignore the "not found" error - isHybrid = false - return + isHybrid = false + if !os.IsNotExist(err) { + // Report unexpected errors. + logrus.WithError(err).Debugf("statfs(%q) failed", hybridMountpoint) } - panic(fmt.Sprintf("cannot statfs cgroup root: %s", err)) + return } isHybrid = st.Type == unix.CGROUP2_SUPER_MAGIC }) |