diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-05 15:57:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 15:57:08 +0200 |
| commit | 4a1331d0afd9a21ff9465916d4006ff7297ae07c (patch) | |
| tree | 97b56fc4361ed81c84dff9e07d46abf302670f1b /cmd/podman/root.go | |
| parent | c313eec620becf710af925c02b7e5dfd80bd9ba6 (diff) | |
| parent | 6ed3b8841f00d2aa1f86678c079a119e027b0d66 (diff) | |
| download | podman-4a1331d0afd9a21ff9465916d4006ff7297ae07c.tar.gz podman-4a1331d0afd9a21ff9465916d4006ff7297ae07c.tar.bz2 podman-4a1331d0afd9a21ff9465916d4006ff7297ae07c.zip | |
Merge pull request #6077 from rhatdan/v2
Fix errors found when comparing podman v1 --help versus V2
Diffstat (limited to 'cmd/podman/root.go')
| -rw-r--r-- | cmd/podman/root.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 375faf8b1..502b6c03c 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -212,7 +212,7 @@ func rootFlags(opts *entities.PodmanConfig, flags *pflag.FlagSet) { flags.StringSliceVar(&opts.Identities, "identity", []string{}, "path to SSH identity file") cfg := opts.Config - flags.StringVar(&cfg.Engine.CgroupManager, "cgroup-manager", cfg.Engine.CgroupManager, opts.CGroupUsage) + flags.StringVar(&cfg.Engine.CgroupManager, "cgroup-manager", cfg.Engine.CgroupManager, "Cgroup manager to use (\"cgroupfs\"|\"systemd\")") flags.StringVar(&opts.CpuProfile, "cpu-profile", "", "Path for the cpu profiling results") flags.StringVar(&opts.ConmonPath, "conmon", "", "Path of the conmon binary") flags.StringVar(&cfg.Engine.NetworkCmdPath, "network-cmd-path", cfg.Engine.NetworkCmdPath, "Path to the command for configuring the network") |