diff options
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/main.go | 6 | ||||
-rw-r--r-- | cmd/podman/varlink.go | 4 | ||||
-rw-r--r-- | cmd/podman/varlink_dummy.go | 9 |
3 files changed, 17 insertions, 2 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 8ee86dd92..f936a332f 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -75,10 +75,14 @@ func main() { topCommand, umountCommand, unpauseCommand, - varlinkCommand, versionCommand, waitCommand, } + + if varlinkCommand != nil { + app.Commands = append(app.Commands, *varlinkCommand) + } + app.Before = func(c *cli.Context) error { logLevel := c.GlobalString("log-level") if logLevel != "" { diff --git a/cmd/podman/varlink.go b/cmd/podman/varlink.go index ca3159460..f1bf2db6b 100644 --- a/cmd/podman/varlink.go +++ b/cmd/podman/varlink.go @@ -1,3 +1,5 @@ +// +build varlink + package main import ( @@ -25,7 +27,7 @@ var ( Value: 1000, }, } - varlinkCommand = cli.Command{ + varlinkCommand = &cli.Command{ Name: "varlink", Usage: "Run varlink interface", Description: varlinkDescription, diff --git a/cmd/podman/varlink_dummy.go b/cmd/podman/varlink_dummy.go new file mode 100644 index 000000000..ec4bbb208 --- /dev/null +++ b/cmd/podman/varlink_dummy.go @@ -0,0 +1,9 @@ +// +build !varlink + +package main + +import ( + "github.com/urfave/cli" +) + +var varlinkCommand *cli.Command |