diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-21 19:35:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 19:35:39 +0200 |
| commit | c3b6e623bba748fcfdae4f755e04c7185a85e79c (patch) | |
| tree | e24cc9c59754eedf5757a3175bc9ef12e4c40b8a /cmd/podman | |
| parent | 8e5d7aa79c1268b779ccd603f1058638472de8ae (diff) | |
| parent | 2e7d2c2f47739f0d11c28f37cbd56781d6fceaeb (diff) | |
| download | podman-c3b6e623bba748fcfdae4f755e04c7185a85e79c.tar.gz podman-c3b6e623bba748fcfdae4f755e04c7185a85e79c.tar.bz2 podman-c3b6e623bba748fcfdae4f755e04c7185a85e79c.zip | |
Merge pull request #6320 from rhatdan/skip
Start testing with cross compilation
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/pods/create.go | 3 | ||||
| -rw-r--r-- | cmd/podman/system/service.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 88b615fab..62b5b849e 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -13,7 +13,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" @@ -61,7 +60,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 ( |