merge opencontainers#4331 into opencontainers/runc:main

Sebastiaan van Stijn (1): libct/userns: split userns detection from internal userns code LGTMs: kolyshkin cyphar
lifubang · Jul 3, 2024 · 81d63f2 · 81d63f2
2 parents 7ea37b9 + 30b530c
commit 81d63f2
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/libcontainer/integration/exec_test.go b/libcontainer/integration/exec_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
 	"github.com/opencontainers/runc/libcontainer/configs"
-	"github.com/opencontainers/runc/libcontainer/userns"
+	"github.com/opencontainers/runc/libcontainer/internal/userns"
 	"github.com/opencontainers/runc/libcontainer/utils"
 	"github.com/opencontainers/runtime-spec/specs-go"
 
@@ -724,7 +724,7 @@ func TestContainerState(t *testing.T) {
 		{Type: configs.NEWNS},
 		{Type: configs.NEWUTS},
 		// host for IPC
-		//{Type: configs.NEWIPC},
+		// {Type: configs.NEWIPC},
 		{Type: configs.NEWPID},
 		{Type: configs.NEWNET},
 	})

diff --git a/libcontainer/userns/userns_maps.c → libcontainer/internal/userns/userns_maps.c b/libcontainer/userns/userns_maps.c → libcontainer/internal/userns/userns_maps.c
diff --git a/libcontainer/userns/userns_maps_linux.go → ...iner/internal/userns/userns_maps_linux.go b/libcontainer/userns/userns_maps_linux.go → ...iner/internal/userns/userns_maps_linux.go
diff --git a/libcontainer/userns/usernsfd_linux.go → ...ntainer/internal/userns/usernsfd_linux.go b/libcontainer/userns/usernsfd_linux.go → ...ntainer/internal/userns/usernsfd_linux.go
diff --git a/libcontainer/userns/usernsfd_linux_test.go → ...er/internal/userns/usernsfd_linux_test.go b/libcontainer/userns/usernsfd_linux_test.go → ...er/internal/userns/usernsfd_linux_test.go
diff --git a/libcontainer/mount_linux.go b/libcontainer/mount_linux.go
@@ -11,7 +11,7 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/opencontainers/runc/libcontainer/configs"
-	"github.com/opencontainers/runc/libcontainer/userns"
+	"github.com/opencontainers/runc/libcontainer/internal/userns"
 	"github.com/opencontainers/runc/libcontainer/utils"
 )
 

diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go
@@ -23,9 +23,9 @@ import (
 	"github.com/opencontainers/runc/libcontainer/cgroups/fs2"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/intelrdt"
+	"github.com/opencontainers/runc/libcontainer/internal/userns"
 	"github.com/opencontainers/runc/libcontainer/logs"
 	"github.com/opencontainers/runc/libcontainer/system"
-	"github.com/opencontainers/runc/libcontainer/userns"
 	"github.com/opencontainers/runc/libcontainer/utils"
 )
 

diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -17,8 +17,8 @@ import (
 	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/devices"
+	"github.com/opencontainers/runc/libcontainer/internal/userns"
 	"github.com/opencontainers/runc/libcontainer/seccomp"
-	"github.com/opencontainers/runc/libcontainer/userns"
 	libcontainerUtils "github.com/opencontainers/runc/libcontainer/utils"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"