Moving the rest of runc to x/sys/unix

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
opencontainers · May 11, 2017 · d3618be · d3618be
1 parent 852f375
commit d3618be
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/checkpoint.go b/checkpoint.go
@@ -6,11 +6,12 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"syscall"
 
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/urfave/cli"
+
+	"golang.org/x/sys/unix"
 )
 
 var checkpointCommand = cli.Command{
@@ -113,7 +114,7 @@ func setManageCgroupsMode(context *cli.Context, options *libcontainer.CriuOpts)
 }
 
 var namespaceMapping = map[specs.LinuxNamespaceType]int{
-	specs.NetworkNamespace: syscall.CLONE_NEWNET,
+	specs.NetworkNamespace: unix.CLONE_NEWNET,
 }
 
 func setEmptyNsMask(context *cli.Context, options *libcontainer.CriuOpts) error {

diff --git a/delete.go b/delete.go
@@ -11,10 +11,12 @@ import (
 
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/urfave/cli"
+
+	"golang.org/x/sys/unix"
 )
 
 func killContainer(container libcontainer.Container) error {
-	_ = container.Signal(syscall.SIGKILL, false)
+	_ = container.Signal(unix.SIGKILL, false)
 	for i := 0; i < 100; i++ {
 		time.Sleep(100 * time.Millisecond)
 		if err := container.Signal(syscall.Signal(0), false); err != nil {

diff --git a/list.go b/list.go
@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"syscall"
+	"syscall" // avoid use if possible
 	"text/tabwriter"
 	"time"
 

diff --git a/restore.go b/restore.go
@@ -5,14 +5,15 @@ package main
 import (
 	"fmt"
 	"os"
-	"syscall"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/specconv"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/urfave/cli"
+
+	"golang.org/x/sys/unix"
 )
 
 var restoreCommand = cli.Command{
@@ -189,7 +190,7 @@ func restoreContainer(context *cli.Context, spec *specs.Spec, config *configs.Co
 	}
 	if pidFile := context.String("pid-file"); pidFile != "" {
 		if err := createPidFile(pidFile, process); err != nil {
-			_ = process.Signal(syscall.SIGKILL)
+			_ = process.Signal(unix.SIGKILL)
 			_, _ = process.Wait()
 			return -1, err
 		}

diff --git a/utils_linux.go b/utils_linux.go
@@ -9,7 +9,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"syscall"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/coreos/go-systemd/activation"
@@ -20,6 +19,8 @@ import (
 	"github.com/opencontainers/runc/libcontainer/utils"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/urfave/cli"
+
+	"golang.org/x/sys/unix"
 )
 
 var errEmptyID = errors.New("container id cannot be empty")
@@ -308,7 +309,7 @@ func (r *runner) destroy() {
 }
 
 func (r *runner) terminate(p *libcontainer.Process) {
-	_ = p.Signal(syscall.SIGKILL)
+	_ = p.Signal(unix.SIGKILL)
 	_, _ = p.Wait()
 }