linux -> runtime/linux

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

cmd/containerd-shim/main_unix.go

@@ -35,10 +35,10 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/events"
-	"github.com/containerd/containerd/linux/proc"
-	"github.com/containerd/containerd/linux/shim"
-	shimapi "github.com/containerd/containerd/linux/shim/v1"
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/runtime/linux/proc"
+	"github.com/containerd/containerd/runtime/linux/shim"
+	shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
 	"github.com/containerd/typeurl"
 	ptypes "github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"

cmd/containerd-shim/shim_darwin.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/containerd/containerd/linux/shim"
+	"github.com/containerd/containerd/runtime/linux/shim"
 	runc "github.com/containerd/go-runc"
 	"github.com/stevvooe/ttrpc"
 )

cmd/containerd-shim/shim_linux.go

@@ -20,7 +20,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/containerd/containerd/linux/shim"
+	"github.com/containerd/containerd/runtime/linux/shim"
 	runc "github.com/containerd/go-runc"
 	"github.com/opencontainers/runc/libcontainer/system"
 	"github.com/stevvooe/ttrpc"

cmd/containerd-shim/shim_unix.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/containerd/containerd/linux/shim"
+	"github.com/containerd/containerd/runtime/linux/shim"
 	runc "github.com/containerd/go-runc"
 	"github.com/stevvooe/ttrpc"
 )

cmd/containerd/builtins_linux.go

@@ -18,8 +18,8 @@ package main
 
 import (
 	_ "github.com/containerd/aufs"
-	_ "github.com/containerd/containerd/linux"
 	_ "github.com/containerd/containerd/metrics/cgroups"
+	_ "github.com/containerd/containerd/runtime/linux"
 	_ "github.com/containerd/containerd/snapshots/native"
 	_ "github.com/containerd/containerd/snapshots/overlay"
 	_ "github.com/containerd/zfs"

cmd/ctr/commands/shim/shim.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/containerd/console"
 	"github.com/containerd/containerd/cmd/ctr/commands"
-	shim "github.com/containerd/containerd/linux/shim/v1"
+	shim "github.com/containerd/containerd/runtime/linux/shim/v1"
 	"github.com/containerd/typeurl"
 	ptypes "github.com/gogo/protobuf/types"
 	"github.com/opencontainers/runtime-spec/specs-go"