summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-05-21 10:55:58 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-05-21 11:58:15 -0400
commit2e7d2c2f47739f0d11c28f37cbd56781d6fceaeb (patch)
tree978a17e715b8020cf69bb7ee48d0ddf0b5e95627 /cmd/podman
parenta852afab2f37026fa8a45d115c61cd77fb3e7ef1 (diff)
downloadpodman-2e7d2c2f47739f0d11c28f37cbd56781d6fceaeb.tar.gz
podman-2e7d2c2f47739f0d11c28f37cbd56781d6fceaeb.tar.bz2
podman-2e7d2c2f47739f0d11c28f37cbd56781d6fceaeb.zip
Start testing with cross compilation
Add missing man page links for podman-image-search and podman-image-diff Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/pods/create.go3
-rw-r--r--cmd/podman/system/service.go2
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index e24cdef98..6eac87f6e 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -12,7 +12,6 @@ import (
"github.com/containers/libpod/cmd/podman/validate"
"github.com/containers/libpod/pkg/domain/entities"
"github.com/containers/libpod/pkg/errorhandling"
- createconfig "github.com/containers/libpod/pkg/spec"
"github.com/containers/libpod/pkg/specgen"
"github.com/containers/libpod/pkg/util"
"github.com/pkg/errors"
@@ -60,7 +59,7 @@ func init() {
flags.StringVarP(&createOptions.Name, "name", "n", "", "Assign a name to the pod")
flags.StringVarP(&createOptions.Hostname, "hostname", "", "", "Set a hostname to the pod")
flags.StringVar(&podIDFile, "pod-id-file", "", "Write the pod ID to the file")
- flags.StringVar(&share, "share", createconfig.DefaultKernelNamespaces, "A comma delimited list of kernel namespaces the pod will share")
+ flags.StringVar(&share, "share", specgen.DefaultKernelNamespaces, "A comma delimited list of kernel namespaces the pod will share")
flags.SetNormalizeFunc(aliasNetworkFlag)
}
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 552c72f79..b5dd2f2aa 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -1,3 +1,5 @@
+// +build linux
+
package system
import (