diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-04 10:52:29 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-04 14:16:34 -0400 |
| commit | 6ed3b8841f00d2aa1f86678c079a119e027b0d66 (patch) | |
| tree | 4befccb87c0b5e4208af4e3ed92b144d7ba45c59 /cmd/podman/root.go | |
| parent | 01aad516e012fe46179e053addd7a8a84788228b (diff) | |
| download | podman-6ed3b8841f00d2aa1f86678c079a119e027b0d66.tar.gz podman-6ed3b8841f00d2aa1f86678c079a119e027b0d66.tar.bz2 podman-6ed3b8841f00d2aa1f86678c079a119e027b0d66.zip | |
Fix errors found when comparing podman v1 --help versus V2
Mainly add missing commands to podman image, podman containers, podman system
Also fix some informations messages and descriptions.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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") |