summaryrefslogtreecommitdiff
path: root/cmd/podman/system
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-29 11:31:39 -0400
committerGitHub <noreply@github.com>2020-06-29 11:31:39 -0400
commit59e6192eb6027ebf520a4b5ea4137d0a85f23c02 (patch)
treed4641b6c3f7d6a1c7d4fa64df3994578ca0630be /cmd/podman/system
parent6ac009d5304127f6758be157c7302646e5a481e5 (diff)
parent6fb5f01c736d5cbf11bc7eaad09f6f0c7fd1d0d4 (diff)
downloadpodman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.tar.gz
podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.tar.bz2
podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.zip
Merge pull request #6716 from jwhonce/issues/6598
Fixes --remote flag issues
Diffstat (limited to 'cmd/podman/system')
-rw-r--r--cmd/podman/system/connection.go1
-rw-r--r--cmd/podman/system/system.go9
2 files changed, 4 insertions, 6 deletions
diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go
index 9f80a454b..8ee441446 100644
--- a/cmd/podman/system/connection.go
+++ b/cmd/podman/system/connection.go
@@ -60,7 +60,6 @@ func init() {
})
flags := connectionCmd.Flags()
- flags.StringVar(&cOpts.Identity, "identity", "", "path to ssh identity file")
flags.IntVarP(&cOpts.Port, "port", "p", 22, "port number for destination")
flags.StringVar(&cOpts.UDSPath, "socket-path", "", "path to podman socket on remote host. (default '/run/podman/podman.sock' or '/run/user/{uid}/podman/podman.sock)")
}
diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go
index acf41a32d..7937e6df8 100644
--- a/cmd/podman/system/system.go
+++ b/cmd/podman/system/system.go
@@ -13,11 +13,10 @@ var (
// Command: podman _system_
systemCmd = &cobra.Command{
- Use: "system",
- Short: "Manage podman",
- Long: "Manage podman",
- TraverseChildren: true,
- RunE: validate.SubCommandExists,
+ Use: "system",
+ Short: "Manage podman",
+ Long: "Manage podman",
+ RunE: validate.SubCommandExists,
}
)