7 files changed, 92 insertions, 2 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go
index 77156f47a..43ba7ddc9 100644
--- a/cmd/podman/cliconfig/config.go
+++ b/cmd/podman/cliconfig/config.go
@@ -177,6 +177,12 @@ type InfoValues struct {
 	Format string
 }
 
+type InitValues struct {
+	PodmanCommand
+	All    bool
+	Latest bool
+}
+
 type InspectValues struct {
 	PodmanCommand
 	TypeObject string
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index 6a3badc41..bbf01d1f8 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -56,6 +56,7 @@ var (
 		_diffCommand,
 		_exportCommand,
 		_createCommand,
+		_initCommand,
 		_killCommand,
 		_listSubCommand,
 		_logsCommand,
diff --git a/cmd/podman/errors_remote.go b/cmd/podman/errors_remote.go
index ab255ea56..1e276be10 100644
--- a/cmd/podman/errors_remote.go
+++ b/cmd/podman/errors_remote.go
@@ -33,6 +33,8 @@ func outputError(err error) {
 			ne = errors.New(e.Reason)
 		case *iopodman.VolumeNotFound:
 			ne = errors.New(e.Reason)
+		case *iopodman.InvalidState:
+			ne = errors.New(e.Reason)
 		case *iopodman.ErrorOccurred:
 			ne = errors.New(e.Reason)
 		default:
diff --git a/cmd/podman/init.go b/cmd/podman/init.go
new file mode 100644
index 000000000..68c80631d
--- /dev/null
+++ b/cmd/podman/init.go
@@ -0,0 +1,64 @@
+package main
+
+import (
+	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/containers/libpod/pkg/adapter"
+	"github.com/opentracing/opentracing-go"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	initCommand     cliconfig.InitValues
+	initDescription = `Initialize one or more containers, creating the OCI spec and mounts for inspection. Container names or IDs can be used.`
+
+	_initCommand = &cobra.Command{
+		Use:   "init [flags] CONTAINER [CONTAINER...]",
+		Short: "Initialize one or more containers",
+		Long:  initDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			initCommand.InputArgs = args
+			initCommand.GlobalFlags = MainGlobalOpts
+			initCommand.Remote = remoteclient
+			return initCmd(&initCommand)
+		},
+		Args: func(cmd *cobra.Command, args []string) error {
+			return checkAllAndLatest(cmd, args, false)
+		},
+		Example: `podman init --latest
+  podman init 3c45ef19d893
+  podman init test1`,
+	}
+)
+
+func init() {
+	initCommand.Command = _initCommand
+	initCommand.SetHelpTemplate(HelpTemplate())
+	initCommand.SetUsageTemplate(UsageTemplate())
+	flags := initCommand.Flags()
+	flags.BoolVarP(&initCommand.All, "all", "a", false, "Initialize all containers")
+	flags.BoolVarP(&initCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of")
+	markFlagHiddenForRemoteClient("latest", flags)
+}
+
+// initCmd initializes a container
+func initCmd(c *cliconfig.InitValues) error {
+	if c.Bool("trace") {
+		span, _ := opentracing.StartSpanFromContext(Ctx, "initCmd")
+		defer span.Finish()
+	}
+
+	ctx := getContext()
+
+	runtime, err := adapter.GetRuntime(ctx, &c.PodmanCommand)
+	if err != nil {
+		return errors.Wrapf(err, "could not get runtime")
+	}
+	defer runtime.Shutdown(false)
+
+	ok, failures, err := runtime.InitContainers(ctx, c)
+	if err != nil {
+		return err
+	}
+	return printCmdResults(ok, failures)
+}
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index d2ae6a73a..787dd55c0 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -39,6 +39,7 @@ var mainCommands = []*cobra.Command{
 	&_imagesCommand,
 	_importCommand,
 	_infoCommand,
+	_initCommand,
 	&_inspectCommand,
 	_killCommand,
 	_loadCommand,
diff --git a/cmd/podman/shared/workers.go b/cmd/podman/shared/workers.go
index 112af89cc..b6e3f10e7 100644
--- a/cmd/podman/shared/workers.go
+++ b/cmd/podman/shared/workers.go
@@ -110,9 +110,14 @@ func (p *Pool) newWorker(slot int) {
 func DefaultPoolSize(name string) int {
 	numCpus := runtime.NumCPU()
 	switch name {
+	case "init":
+		fallthrough
 	case "kill":
+		fallthrough
 	case "pause":
+		fallthrough
 	case "rm":
+		fallthrough
 	case "unpause":
 		if numCpus <= 3 {
 			return numCpus * 3
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index 309f9765a..912d001e9 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -641,6 +641,14 @@ method StartContainer(name: string) -> (container: string)
 # ~~~
 method StopContainer(name: string, timeout: int) -> (container: string)
 
+# InitContainer initializes the given container. It accepts a container name or
+# ID, and will initialize the container matching that ID if possible, and error
+# if not. Containers can only be initialized when they are in the Created or
+# Exited states. Initialization prepares a container to be started, but does not
+# start the container. It is intended to be used to debug a container's state
+# prior to starting it.
+method InitContainer(name: string) -> (container: string)
+
 # RestartContainer will restart a running container given a container name or ID and timeout value. The timeout
 # value is the time before a forcible stop is used to stop the container.  If the container cannot be found by
 # name or ID, a [ContainerNotFound](#ContainerNotFound)  error will be returned; otherwise, the ID of the
@@ -1225,7 +1233,7 @@ error PodNotFound (name: string, reason: string)
 # VolumeNotFound means the volume could not be found by the name or ID in local storage.
 error VolumeNotFound (id: string, reason: string)
 
-# PodContainerError means a container associated with a pod failed to preform an operation. It contains
+# PodContainerError means a container associated with a pod failed to perform an operation. It contains
 # a container ID of the container that failed.
 error PodContainerError (podname: string, errors: []PodContainerErrorData)
 
@@ -1233,6 +1241,9 @@ error PodContainerError (podname: string, errors: []PodContainerErrorData)
 # the pod ID.
 error NoContainersInPod (name: string)
 
+# InvalidState indicates that a container or pod was in an improper state for the requested operation
+error InvalidState (id: string, reason: string)
+
 # ErrorOccurred is a generic error for an error that occurs during the execution.  The actual error message
 # is includes as part of the error's text.
 error ErrorOccurred (reason: string)
@@ -1241,4 +1252,4 @@ error ErrorOccurred (reason: string)
 error RuntimeError (reason: string)
 
 # The Podman endpoint requires that you use a streaming connection.
-error WantsMoreRequired (reason: string)
+error WantsMoreRequired (reason: string)
+\ No newline at end of file