4 files changed, 95 insertions, 2 deletions
diff --git a/cmd/podman/cleanup.go b/cmd/podman/cleanup.go
new file mode 100644
index 000000000..33b0fad45
--- /dev/null
+++ b/cmd/podman/cleanup.go
@@ -0,0 +1,92 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
+	"github.com/projectatomic/libpod/libpod"
+	"github.com/urfave/cli"
+)
+
+var (
+	cleanupFlags = []cli.Flag{
+		cli.BoolFlag{
+			Name:  "all, a",
+			Usage: "Cleans up all containers",
+		},
+		LatestFlag,
+	}
+	cleanupDescription = `
+   podman container cleanup
+
+   Cleans up mount points and network stacks on one or more containers from the host. The container name or ID can be used. This command is used internally when running containers, but can also be used if container cleanup has failed when a container exits.
+`
+	cleanupCommand = cli.Command{
+		Name:        "cleanup",
+		Usage:       "Cleanup network and mountpoints of one or more containers",
+		Description: cleanupDescription,
+		Flags:       cleanupFlags,
+		Action:      cleanupCmd,
+		ArgsUsage:   "CONTAINER-NAME [CONTAINER-NAME ...]",
+	}
+)
+
+func cleanupCmd(c *cli.Context) error {
+	if err := validateFlags(c, cleanupFlags); err != nil {
+		return err
+	}
+	runtime, err := libpodruntime.GetRuntime(c)
+	if err != nil {
+		return errors.Wrapf(err, "could not get runtime")
+	}
+	defer runtime.Shutdown(false)
+
+	args := c.Args()
+
+	var lastError error
+	var cleanupContainers []*libpod.Container
+	if c.Bool("all") {
+		if c.Bool("lastest") {
+			return errors.New("--all and --latest cannot be used together")
+		}
+		if len(args) != 0 {
+			return errors.New("--all and explicit container IDs cannot be used together")
+		}
+		cleanupContainers, err = runtime.GetContainers()
+		if err != nil {
+			return errors.Wrapf(err, "unable to get container list")
+		}
+	} else if c.Bool("latest") {
+		if len(args) != 0 {
+			return errors.New("--latest and explicit container IDs cannot be used together")
+		}
+		lastCtr, err := runtime.GetLatestContainer()
+		if err != nil {
+			return errors.Wrapf(err, "unable to get latest container")
+		}
+		cleanupContainers = append(cleanupContainers, lastCtr)
+	} else {
+		for _, i := range args {
+			container, err := runtime.LookupContainer(i)
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err)
+				lastError = errors.Wrapf(err, "unable to find container %s", i)
+				continue
+			}
+			cleanupContainers = append(cleanupContainers, container)
+		}
+	}
+	for _, ctr := range cleanupContainers {
+		if err = ctr.Cleanup(); err != nil {
+			if lastError != nil {
+				fmt.Fprintln(os.Stderr, lastError)
+			}
+			lastError = errors.Wrapf(err, "failed to cleanup container %v", ctr.ID())
+		} else {
+			fmt.Println(ctr.ID())
+		}
+	}
+	return lastError
+}
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index e3256d78b..e0684a3fd 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -7,6 +7,7 @@ import (
 var (
 	subCommands = []cli.Command{
 		attachCommand,
+		cleanupCommand,
 		commitCommand,
 		createCommand,
 		diffCommand,
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 440406903..19e87c306 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -116,7 +116,7 @@ func createCmd(c *cli.Context) error {
 		return err
 	}
 
-	options, err := createConfig.GetContainerCreateOptions()
+	options, err := createConfig.GetContainerCreateOptions(runtime)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 421b868ad..8eb747686 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -110,7 +110,7 @@ func runCmd(c *cli.Context) error {
 		return err
 	}
 
-	options, err := createConfig.GetContainerCreateOptions()
+	options, err := createConfig.GetContainerCreateOptions(runtime)
 	if err != nil {
 		return err
 	}