Move RunningInUserNS() to its own package

This allows using the utility without bringing whole of "sys" with it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2021-03-23 10:51:24 +01:00
parent edf6484165
commit 708299ca40
9 changed files with 38 additions and 13 deletions

View File

@@ -26,7 +26,7 @@ import (
"github.com/containerd/containerd/archive"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/sys"
"github.com/containerd/containerd/pkg/userns"
"github.com/pkg/errors"
)
@@ -35,7 +35,7 @@ func apply(ctx context.Context, mounts []mount.Mount, r io.Reader) error {
case len(mounts) == 1 && mounts[0].Type == "overlay":
// OverlayConvertWhiteout (mknod c 0 0) doesn't work in userns.
// https://github.com/containerd/containerd/issues/3762
if sys.RunningInUserNS() {
if userns.RunningInUserNS() {
break
}
path, parents, err := getOverlayPath(mounts[0].Options)