Fixing network ns segfault

As well as small style corrections, update pod_top_test to use CreatePod, and move handling of adding a container to the pod's namespace from container_internal_linux to libpod/option.

Signed-off-by: haircommander <pehunt@redhat.com>

Closes: #1187
Approved by: mheon

1 files changed, 4 insertions, 2 deletions

diff --git a/cmd/podman/pod_create.go b/cmd/podman/pod_create.go
index eb07e7d50..4eb3126e3 100644
--- a/cmd/podman/pod_create.go
+++ b/cmd/podman/pod_create.go
@@ -14,7 +14,7 @@ import (
 )
 
 var (
-	// CRI-O default kernel namespaces
+	// Kernel namespaces shared by default within a pod
 	DefaultKernelNamespaces = "ipc,net,uts"
 )
 
@@ -35,10 +35,12 @@ var podCreateFlags = []cli.Flag{
 	cli.StringFlag{
 		Name:  "infra-image",
 		Usage: "The image of the infra container to associate with the pod",
+		Value: libpod.DefaultInfraImage,
 	},
 	cli.StringFlag{
 		Name:  "infra-command",
 		Usage: "The command to run on the infra container when the pod is started",
+		Value: libpod.DefaultInfraCommand,
 	},
 	cli.StringSliceFlag{
 		Name:  "label-file",
@@ -58,7 +60,7 @@ var podCreateFlags = []cli.Flag{
 	},
 	cli.StringFlag{
 		Name:  "share",
-		Usage: "A comma deliminated list of kernel namespaces the pod will share",
+		Usage: "A comma delimited list of kernel namespaces the pod will share",
 		Value: DefaultKernelNamespaces,
 	},
 }