From 0e6266858a913ac36de0726ede10d5d03af533e3 Mon Sep 17 00:00:00 2001 From: haircommander Date: Mon, 20 Aug 2018 17:56:35 -0400 Subject: 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 Closes: #1187 Approved by: mheon --- cmd/podman/shared/pod.go | 2 -- 1 file changed, 2 deletions(-) (limited to 'cmd/podman/shared') diff --git a/cmd/podman/shared/pod.go b/cmd/podman/shared/pod.go index 99f9f6031..1a14b3777 100644 --- a/cmd/podman/shared/pod.go +++ b/cmd/podman/shared/pod.go @@ -73,12 +73,10 @@ func GetNamespaceOptions(ns []string) ([]libpod.PodCreateOption, error) { case "net": options = append(options, libpod.WithPodNet()) case "mnt": - //options = append(options, libpod.WithPodMNT()) return erroredOptions, errors.Errorf("Mount sharing functionality not supported on pod level") case "pid": options = append(options, libpod.WithPodPID()) case "user": - // Note: more set up needs to be done before this doesn't error out a create. return erroredOptions, errors.Errorf("User sharing functionality not supported on pod level") case "ipc": options = append(options, libpod.WithPodIPC()) -- cgit v1.2.3-54-g00ecf