@@ -69,9 +69,9 @@ linters-settings:

           - pkg: "github.com/containerd/containerd/log"

             desc: The logs package has moved to a separate module, https://github.com/containerd/log

           - pkg: "github.com/containerd/containerd/pkg/userns"

-            desc: Use github.com/moby/sys/user/userns instead.

+            desc: Use github.com/moby/sys/userns instead.

           - pkg: "github.com/opencontainers/runc/libcontainer/userns"

-            desc: Use github.com/moby/sys/user/userns instead.

+            desc: Use github.com/moby/sys/userns instead.

   revive:

     rules:

       # FIXME make sure all packages have a description. Currently, there's many packages without.

@@ -79,7 +79,7 @@ import (

 	resolverconfig "github.com/moby/buildkit/util/resolver/config"

 	"github.com/moby/buildkit/util/tracing"

 	"github.com/moby/locker"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/pkg/errors"

 	"go.etcd.io/bbolt"

 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"

@@ -42,7 +42,7 @@ import (

 	"github.com/docker/docker/pkg/parsers"

 	units "github.com/docker/go-units"

 	"github.com/moby/sys/mount"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/opencontainers/selinux/go-selinux/label"

 	"github.com/pkg/errors"

 	"golang.org/x/sys/unix"

@@ -14,7 +14,7 @@ import (

 	"github.com/docker/docker/pkg/pools"

 	"github.com/docker/docker/pkg/system"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"golang.org/x/sys/unix"

 )

@@ -26,7 +26,7 @@ import (

 	"github.com/docker/docker/pkg/parsers/kernel"

 	"github.com/moby/locker"

 	"github.com/moby/sys/mount"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/opencontainers/selinux/go-selinux/label"

 	"github.com/pkg/errors"

 	"golang.org/x/sys/unix"

@@ -12,7 +12,7 @@ import (

 	"github.com/containerd/containerd/mount"

 	"github.com/docker/docker/daemon/graphdriver/overlayutils"

 	"github.com/docker/docker/pkg/system"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/pkg/errors"

 	"golang.org/x/sys/unix"

 )

@@ -31,7 +31,7 @@ import (

 	units "github.com/docker/go-units"

 	"github.com/moby/locker"

 	"github.com/moby/sys/mount"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/opencontainers/selinux/go-selinux/label"

 	"golang.org/x/sys/unix"

 )

@@ -11,7 +11,7 @@ import (

 	"github.com/containerd/log"

 	"github.com/docker/docker/daemon/graphdriver"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/pkg/errors"

 	"golang.org/x/sys/unix"

 )

@@ -28,7 +28,7 @@ import (

 	"github.com/containerd/containerd/mount"

 	"github.com/containerd/log"

 	"github.com/docker/docker/pkg/parsers/kernel"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 )

 // NeedsUserXAttr returns whether overlayfs should be mounted with the "userxattr" mount option.

@@ -28,7 +28,7 @@ import (

 	"github.com/moby/sys/mount"

 	"github.com/moby/sys/mountinfo"

 	"github.com/moby/sys/user"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/opencontainers/runc/libcontainer/cgroups"

 	specs "github.com/opencontainers/runtime-spec/specs-go"

 	"github.com/pkg/errors"

@@ -7,7 +7,7 @@ import (

 	"strings"

 	"github.com/docker/docker/pkg/system"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/pkg/errors"

 	"golang.org/x/sys/unix"

 )

@@ -11,7 +11,7 @@ import (

 	"github.com/docker/docker/pkg/system"

 	"github.com/google/go-cmp/cmp/cmpopts"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"golang.org/x/sys/unix"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -19,7 +19,7 @@ import (

 	"github.com/docker/docker/pkg/idtools"

 	"github.com/docker/docker/pkg/ioutils"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

 	"gotest.tools/v3/skip"

@@ -15,7 +15,7 @@ import (

 	"testing"

 	"github.com/docker/docker/pkg/system"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"golang.org/x/sys/unix"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -7,7 +7,7 @@ import (

 	"path/filepath"

 	"github.com/docker/docker/pkg/archive"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 )

 // applyLayerHandler parses a diff in the standard layer format from `layer`, and

@@ -11,7 +11,7 @@ import (

 	"sync"

 	"github.com/containerd/log"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/pkg/errors"

 )

@@ -9,7 +9,7 @@ import (

 	"github.com/containerd/cgroups/v3"

 	cgroupsV2 "github.com/containerd/cgroups/v3/cgroup2"

 	"github.com/containerd/log"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 )

 func newV2(options ...Opt) *SysInfo {

@@ -13,7 +13,7 @@ import (

 	"github.com/docker/docker/internal/rootless/mountopts"

 	"github.com/docker/docker/internal/sliceutil"

 	"github.com/docker/docker/oci"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	specs "github.com/opencontainers/runtime-spec/specs-go"

 	"github.com/pkg/errors"

 )

@@ -61,7 +61,7 @@ import (

 	"unsafe"

 	"github.com/containerd/log"

-	"github.com/moby/sys/user/userns"

+	"github.com/moby/sys/userns"

 	"github.com/pkg/errors"

 	"golang.org/x/sys/unix"

 )

@@ -75,7 +75,8 @@ require (

 	github.com/moby/sys/sequential v0.6.0

 	github.com/moby/sys/signal v0.7.1

 	github.com/moby/sys/symlink v0.3.0

-	github.com/moby/sys/user v0.2.0

+	github.com/moby/sys/user v0.3.0

+	github.com/moby/sys/userns v0.1.0

 	github.com/moby/term v0.5.0

 	github.com/morikuni/aec v1.0.0

 	github.com/opencontainers/go-digest v1.0.0

@@ -500,8 +500,10 @@ github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0

 github.com/moby/sys/signal v0.7.1/go.mod h1:Se1VGehYokAkrSQwL4tDzHvETwUZlnY7S5XtQ50mQp8=

 github.com/moby/sys/symlink v0.3.0 h1:GZX89mEZ9u53f97npBy4Rc3vJKj7JBDj/PN2I22GrNU=

 github.com/moby/sys/symlink v0.3.0/go.mod h1:3eNdhduHmYPcgsJtZXW1W4XUJdZGBIkttZ8xKqPUJq0=

-github.com/moby/sys/user v0.2.0 h1:OnpapJsRp25vkhw8TFG6OLJODNh/3rEwRWtJ3kakwRM=

-github.com/moby/sys/user v0.2.0/go.mod h1:RYstrcWOJpVh+6qzUqp2bU3eaRpdiQeKGlKitaH0PM8=

+github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=

+github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=

+github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=

+github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=

 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=

 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=

 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

deleted file mode 100644

@@ -1,16 +0,0 @@

-// Package userns provides utilities to detect whether we are currently running

-// in a Linux user namespace.

-//

-// This code was migrated from [libcontainer/runc], which based its implementation

-// on code from [lcx/incus].

-//

-// [libcontainer/runc]: https://github.com/opencontainers/runc/blob/3778ae603c706494fd1e2c2faf83b406e38d687d/libcontainer/userns/userns_linux.go#L12-L49

-// [lcx/incus]: https://github.com/lxc/incus/blob/e45085dd42f826b3c8c3228e9733c0b6f998eafe/shared/util.go#L678-L700

-package userns

-

-// RunningInUserNS detects whether we are currently running in a Linux

-// user namespace and memoizes the result. It returns false on non-Linux

-// platforms.

-func RunningInUserNS() bool {

-	return inUserNS()

-}

deleted file mode 100644

@@ -1,53 +0,0 @@

-package userns

-

-import (

-	"bufio"

-	"fmt"

-	"os"

-	"sync"

-)

-

-var inUserNS = sync.OnceValue(runningInUserNS)

-

-// runningInUserNS detects whether we are currently running in a user namespace.

-//

-// This code was migrated from [libcontainer/runc] and based on an implementation

-// from [lcx/incus].

-//

-// [libcontainer/runc]: https://github.com/opencontainers/runc/blob/3778ae603c706494fd1e2c2faf83b406e38d687d/libcontainer/userns/userns_linux.go#L12-L49

-// [lcx/incus]: https://github.com/lxc/incus/blob/e45085dd42f826b3c8c3228e9733c0b6f998eafe/shared/util.go#L678-L700

-func runningInUserNS() bool {

-	file, err := os.Open("/proc/self/uid_map")

-	if err != nil {

-		// This kernel-provided file only exists if user namespaces are supported.

-		return false

-	}

-	defer file.Close()

-

-	buf := bufio.NewReader(file)

-	l, _, err := buf.ReadLine()

-	if err != nil {

-		return false

-	}

-

-	return uidMapInUserNS(string(l))

-}

-

-func uidMapInUserNS(uidMap string) bool {

-	if uidMap == "" {

-		// File exist but empty (the initial state when userns is created,

-		// see user_namespaces(7)).

-		return true

-	}

-

-	var a, b, c int64

-	if _, err := fmt.Sscanf(uidMap, "%d %d %d", &a, &b, &c); err != nil {

-		// Assume we are in a regular, non user namespace.

-		return false

-	}

-

-	// As per user_namespaces(7), /proc/self/uid_map of

-	// the initial user namespace shows 0 0 4294967295.

-	initNS := a == 0 && b == 0 && c == 4294967295

-	return !initNS

-}

deleted file mode 100644

@@ -1,8 +0,0 @@

-//go:build linux && gofuzz

-

-package userns

-

-func FuzzUIDMap(uidmap []byte) int {

-	_ = uidMapInUserNS(string(uidmap))

-	return 1

-}

deleted file mode 100644

@@ -1,6 +0,0 @@

-//go:build !linux

-

-package userns

-

-// inUserNS is a stub for non-Linux systems. Always returns false.

-func inUserNS() bool { return false }

new file mode 100644

@@ -0,0 +1,202 @@

+

+                                 Apache License

+                           Version 2.0, January 2004

+                        http://www.apache.org/licenses/

+

+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

+   1. Definitions.

+

+      "License" shall mean the terms and conditions for use, reproduction,

+      and distribution as defined by Sections 1 through 9 of this document.

+

+      "Licensor" shall mean the copyright owner or entity authorized by

+      the copyright owner that is granting the License.

+

+      "Legal Entity" shall mean the union of the acting entity and all

+      other entities that control, are controlled by, or are under common

+      control with that entity. For the purposes of this definition,

+      "control" means (i) the power, direct or indirect, to cause the

+      direction or management of such entity, whether by contract or

+      otherwise, or (ii) ownership of fifty percent (50%) or more of the

+      outstanding shares, or (iii) beneficial ownership of such entity.

+

+      "You" (or "Your") shall mean an individual or Legal Entity

+      exercising permissions granted by this License.

+

+      "Source" form shall mean the preferred form for making modifications,

+      including but not limited to software source code, documentation

+      source, and configuration files.

+

+      "Object" form shall mean any form resulting from mechanical

+      transformation or translation of a Source form, including but

+      not limited to compiled object code, generated documentation,

+      and conversions to other media types.

+

+      "Work" shall mean the work of authorship, whether in Source or

+      Object form, made available under the License, as indicated by a

+      copyright notice that is included in or attached to the work

+      (an example is provided in the Appendix below).

+

+      "Derivative Works" shall mean any work, whether in Source or Object

+      form, that is based on (or derived from) the Work and for which the

+      editorial revisions, annotations, elaborations, or other modifications

+      represent, as a whole, an original work of authorship. For the purposes

+      of this License, Derivative Works shall not include works that remain

+      separable from, or merely link (or bind by name) to the interfaces of,

+      the Work and Derivative Works thereof.

+

+      "Contribution" shall mean any work of authorship, including

+      the original version of the Work and any modifications or additions

+      to that Work or Derivative Works thereof, that is intentionally

+      submitted to Licensor for inclusion in the Work by the copyright owner

+      or by an individual or Legal Entity authorized to submit on behalf of

+      the copyright owner. For the purposes of this definition, "submitted"

+      means any form of electronic, verbal, or written communication sent

+      to the Licensor or its representatives, including but not limited to

+      communication on electronic mailing lists, source code control systems,

+      and issue tracking systems that are managed by, or on behalf of, the

+      Licensor for the purpose of discussing and improving the Work, but

+      excluding communication that is conspicuously marked or otherwise

+      designated in writing by the copyright owner as "Not a Contribution."

+

+      "Contributor" shall mean Licensor and any individual or Legal Entity

+      on behalf of whom a Contribution has been received by Licensor and

+      subsequently incorporated within the Work.

+

+   2. Grant of Copyright License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      copyright license to reproduce, prepare Derivative Works of,

+      publicly display, publicly perform, sublicense, and distribute the

+      Work and such Derivative Works in Source or Object form.

+

+   3. Grant of Patent License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      (except as stated in this section) patent license to make, have made,

+      use, offer to sell, sell, import, and otherwise transfer the Work,

+      where such license applies only to those patent claims licensable

+      by such Contributor that are necessarily infringed by their

+      Contribution(s) alone or by combination of their Contribution(s)

+      with the Work to which such Contribution(s) was submitted. If You

+      institute patent litigation against any entity (including a

+      cross-claim or counterclaim in a lawsuit) alleging that the Work

+      or a Contribution incorporated within the Work constitutes direct

+      or contributory patent infringement, then any patent licenses

+      granted to You under this License for that Work shall terminate

+      as of the date such litigation is filed.

+

+   4. Redistribution. You may reproduce and distribute copies of the

+      Work or Derivative Works thereof in any medium, with or without

+      modifications, and in Source or Object form, provided that You

+      meet the following conditions:

+

+      (a) You must give any other recipients of the Work or

+          Derivative Works a copy of this License; and

+

+      (b) You must cause any modified files to carry prominent notices

+          stating that You changed the files; and

+

+      (c) You must retain, in the Source form of any Derivative Works

+          that You distribute, all copyright, patent, trademark, and

+          attribution notices from the Source form of the Work,

+          excluding those notices that do not pertain to any part of

+          the Derivative Works; and

+

+      (d) If the Work includes a "NOTICE" text file as part of its

+          distribution, then any Derivative Works that You distribute must

+          include a readable copy of the attribution notices contained

+          within such NOTICE file, excluding those notices that do not

+          pertain to any part of the Derivative Works, in at least one

+          of the following places: within a NOTICE text file distributed

+          as part of the Derivative Works; within the Source form or

+          documentation, if provided along with the Derivative Works; or,

+          within a display generated by the Derivative Works, if and

+          wherever such third-party notices normally appear. The contents

+          of the NOTICE file are for informational purposes only and

+          do not modify the License. You may add Your own attribution

+          notices within Derivative Works that You distribute, alongside

+          or as an addendum to the NOTICE text from the Work, provided

+          that such additional attribution notices cannot be construed

+          as modifying the License.

+

+      You may add Your own copyright statement to Your modifications and

+      may provide additional or different license terms and conditions

+      for use, reproduction, or distribution of Your modifications, or

+      for any such Derivative Works as a whole, provided Your use,

+      reproduction, and distribution of the Work otherwise complies with

+      the conditions stated in this License.

+

+   5. Submission of Contributions. Unless You explicitly state otherwise,

+      any Contribution intentionally submitted for inclusion in the Work

+      by You to the Licensor shall be under the terms and conditions of

+      this License, without any additional terms or conditions.

+      Notwithstanding the above, nothing herein shall supersede or modify

+      the terms of any separate license agreement you may have executed

+      with Licensor regarding such Contributions.

+

+   6. Trademarks. This License does not grant permission to use the trade

+      names, trademarks, service marks, or product names of the Licensor,

+      except as required for reasonable and customary use in describing the

+      origin of the Work and reproducing the content of the NOTICE file.

+

+   7. Disclaimer of Warranty. Unless required by applicable law or

+      agreed to in writing, Licensor provides the Work (and each

+      Contributor provides its Contributions) on an "AS IS" BASIS,

+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+      implied, including, without limitation, any warranties or conditions

+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

+      PARTICULAR PURPOSE. You are solely responsible for determining the

+      appropriateness of using or redistributing the Work and assume any

+      risks associated with Your exercise of permissions under this License.

+

+   8. Limitation of Liability. In no event and under no legal theory,

+      whether in tort (including negligence), contract, or otherwise,

+      unless required by applicable law (such as deliberate and grossly

+      negligent acts) or agreed to in writing, shall any Contributor be

+      liable to You for damages, including any direct, indirect, special,

+      incidental, or consequential damages of any character arising as a

+      result of this License or out of the use or inability to use the

+      Work (including but not limited to damages for loss of goodwill,

+      work stoppage, computer failure or malfunction, or any and all

+      other commercial damages or losses), even if such Contributor

+      has been advised of the possibility of such damages.

+

+   9. Accepting Warranty or Additional Liability. While redistributing

+      the Work or Derivative Works thereof, You may choose to offer,

+      and charge a fee for, acceptance of support, warranty, indemnity,

+      or other liability obligations and/or rights consistent with this

+      License. However, in accepting such obligations, You may act only

+      on Your own behalf and on Your sole responsibility, not on behalf

+      of any other Contributor, and only if You agree to indemnify,

+      defend, and hold each Contributor harmless for any liability

+      incurred by, or claims asserted against, such Contributor by reason

+      of your accepting any such warranty or additional liability.

+

+   END OF TERMS AND CONDITIONS

+

+   APPENDIX: How to apply the Apache License to your work.

+

+      To apply the Apache License to your work, attach the following

+      boilerplate notice, with the fields enclosed by brackets "[]"

+      replaced with your own identifying information. (Don't include

+      the brackets!)  The text should be enclosed in the appropriate

+      comment syntax for the file format. We also recommend that a

+      file or class name and description of purpose be included on the

+      same "printed page" as the copyright notice for easier

+      identification within third-party archives.

+

+   Copyright [yyyy] [name of copyright owner]

+

+   Licensed under the Apache License, Version 2.0 (the "License");

+   you may not use this file except in compliance with the License.

+   You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

new file mode 100644

@@ -0,0 +1,16 @@

+// Package userns provides utilities to detect whether we are currently running

+// in a Linux user namespace.

+//

+// This code was migrated from [libcontainer/runc], which based its implementation

+// on code from [lcx/incus].

+//

+// [libcontainer/runc]: https://github.com/opencontainers/runc/blob/3778ae603c706494fd1e2c2faf83b406e38d687d/libcontainer/userns/userns_linux.go#L12-L49

+// [lcx/incus]: https://github.com/lxc/incus/blob/e45085dd42f826b3c8c3228e9733c0b6f998eafe/shared/util.go#L678-L700

+package userns

+

+// RunningInUserNS detects whether we are currently running in a Linux

+// user namespace and memoizes the result. It returns false on non-Linux

+// platforms.

+func RunningInUserNS() bool {

+	return inUserNS()

+}

new file mode 100644

@@ -0,0 +1,53 @@

+package userns

+

+import (

+	"bufio"

+	"fmt"

+	"os"

+	"sync"

+)

+

+var inUserNS = sync.OnceValue(runningInUserNS)

+

+// runningInUserNS detects whether we are currently running in a user namespace.

+//

+// This code was migrated from [libcontainer/runc] and based on an implementation

+// from [lcx/incus].

+//

+// [libcontainer/runc]: https://github.com/opencontainers/runc/blob/3778ae603c706494fd1e2c2faf83b406e38d687d/libcontainer/userns/userns_linux.go#L12-L49

+// [lcx/incus]: https://github.com/lxc/incus/blob/e45085dd42f826b3c8c3228e9733c0b6f998eafe/shared/util.go#L678-L700

+func runningInUserNS() bool {

+	file, err := os.Open("/proc/self/uid_map")

+	if err != nil {

+		// This kernel-provided file only exists if user namespaces are supported.

+		return false

+	}

+	defer file.Close()

+

+	buf := bufio.NewReader(file)

+	l, _, err := buf.ReadLine()

+	if err != nil {

+		return false

+	}

+

+	return uidMapInUserNS(string(l))

+}

+

+func uidMapInUserNS(uidMap string) bool {

+	if uidMap == "" {

+		// File exist but empty (the initial state when userns is created,

+		// see user_namespaces(7)).

+		return true

+	}

+

+	var a, b, c int64

+	if _, err := fmt.Sscanf(uidMap, "%d %d %d", &a, &b, &c); err != nil {

+		// Assume we are in a regular, non user namespace.

+		return false

+	}

+

+	// As per user_namespaces(7), /proc/self/uid_map of

+	// the initial user namespace shows 0 0 4294967295.

+	initNS := a == 0 && b == 0 && c == 4294967295

+	return !initNS

+}

new file mode 100644

@@ -0,0 +1,8 @@

+//go:build linux && gofuzz

+

+package userns

+

+func FuzzUIDMap(uidmap []byte) int {

+	_ = uidMapInUserNS(string(uidmap))

+	return 1

+}

new file mode 100644

@@ -0,0 +1,6 @@

+//go:build !linux

+

+package userns

+

+// inUserNS is a stub for non-Linux systems. Always returns false.

+func inUserNS() bool { return false }

@@ -968,10 +968,12 @@ github.com/moby/sys/signal

 # github.com/moby/sys/symlink v0.3.0

 ## explicit; go 1.17

 github.com/moby/sys/symlink

-# github.com/moby/sys/user v0.2.0

-## explicit; go 1.21

+# github.com/moby/sys/user v0.3.0

+## explicit; go 1.17

 github.com/moby/sys/user

-github.com/moby/sys/user/userns

+# github.com/moby/sys/userns v0.1.0

+## explicit; go 1.21

+github.com/moby/sys/userns

 # github.com/moby/term v0.5.0

 ## explicit; go 1.18

 github.com/moby/term