mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
libct: move cmsg helpers to new internal/cmsg package
These helpers all make more sense as a self-contained package and moving them has the added benefit of removing an unneeded libpathrs dependency (from libcontainer/utils's import of pathrs-lite) from several test binaries. Signed-off-by: Aleksa Sarai <aleksa@amutable.com>
This commit is contained in:
@@ -34,8 +34,9 @@ import (
|
||||
"sync"
|
||||
|
||||
"github.com/containerd/console"
|
||||
"github.com/opencontainers/runc/libcontainer/utils"
|
||||
"github.com/urfave/cli"
|
||||
|
||||
"github.com/opencontainers/runc/internal/cmsg"
|
||||
)
|
||||
|
||||
// version will be populated by the Makefile, read from
|
||||
@@ -100,7 +101,7 @@ func handleSingle(path string, noStdin bool) error {
|
||||
defer socket.Close()
|
||||
|
||||
// Get the master file descriptor from runC.
|
||||
master, err := utils.RecvFile(socket)
|
||||
master, err := cmsg.RecvFile(socket)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -163,7 +164,7 @@ func handleNull(path string) error {
|
||||
defer socket.Close()
|
||||
|
||||
// Get the master file descriptor from runC.
|
||||
master, err := utils.RecvFile(socket)
|
||||
master, err := cmsg.RecvFile(socket)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user