diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-02 15:58:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 15:58:50 +0200 |
| commit | 080cbf1d9594e835df309c84cf4f89061fb2fc2e (patch) | |
| tree | 56151bfea6e42835e7c49544a193fbd3d7eb7ce3 /pkg/systemd/generate/containers.go | |
| parent | 47a814aa6df97da834315d778cb68f66a82c3231 (diff) | |
| parent | 4dfef202cf8b3e42846a8391a456dea8d024bf07 (diff) | |
| download | podman-080cbf1d9594e835df309c84cf4f89061fb2fc2e.tar.gz podman-080cbf1d9594e835df309c84cf4f89061fb2fc2e.tar.bz2 podman-080cbf1d9594e835df309c84cf4f89061fb2fc2e.zip | |
Merge pull request #15136 from Luap99/systemd-generate-hostname
podman generate systemd --new: allow -h hostname
Diffstat (limited to 'pkg/systemd/generate/containers.go')
| -rw-r--r-- | pkg/systemd/generate/containers.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index 66905202d..1f8c519b7 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -378,6 +378,9 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst fs.StringArrayP("env", "e", nil, "") fs.String("sdnotify", "", "") fs.String("restart", "", "") + // have to define extra -h flag to prevent help error when parsing -h hostname + // https://github.com/containers/podman/issues/15124 + fs.StringP("help", "h", "", "") if err := fs.Parse(remainingCmd); err != nil { return "", fmt.Errorf("parsing remaining command-line arguments: %w", err) } |