diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-25 06:46:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-25 06:46:17 -0400 |
| commit | 1077d2d0b72d027a01080c0d3ebdb7d99a969661 (patch) | |
| tree | fd6b32e485b0985cff943a2084258fd991a9ec35 /pkg/domain/infra/abi | |
| parent | 3fec749f56627fa955f8529392be2c1edcdab452 (diff) | |
| parent | e704f1362abc416786076a932d8e2ca930b9fa2e (diff) | |
| download | podman-1077d2d0b72d027a01080c0d3ebdb7d99a969661.tar.gz podman-1077d2d0b72d027a01080c0d3ebdb7d99a969661.tar.bz2 podman-1077d2d0b72d027a01080c0d3ebdb7d99a969661.zip | |
Merge pull request #6321 from Luap99/podman-generate-systemd-unit-prefix
Allow to change the generated systemd unit name prefix
Diffstat (limited to 'pkg/domain/infra/abi')
| -rw-r--r-- | pkg/domain/infra/abi/generate.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/generate.go b/pkg/domain/infra/abi/generate.go index be5d452bd..abb5e2911 100644 --- a/pkg/domain/infra/abi/generate.go +++ b/pkg/domain/infra/abi/generate.go @@ -159,14 +159,14 @@ func (ic *ContainerEngine) generateSystemdgenContainerInfo(nameOrID string, pod func generateServiceName(ctr *libpod.Container, pod *libpod.Pod, options entities.GenerateSystemdOptions) (string, string) { var kind, name, ctrName string if pod == nil { - kind = "container" + kind = options.ContainerPrefix //defaults to container name = ctr.ID() if options.Name { name = ctr.Name() } ctrName = name } else { - kind = "pod" + kind = options.PodPrefix //defaults to pod name = pod.ID() ctrName = ctr.ID() if options.Name { @@ -174,7 +174,7 @@ func generateServiceName(ctr *libpod.Container, pod *libpod.Pod, options entitie ctrName = ctr.Name() } } - return ctrName, fmt.Sprintf("%s-%s", kind, name) + return ctrName, fmt.Sprintf("%s%s%s", kind, options.Separator, name) } func (ic *ContainerEngine) GenerateKube(ctx context.Context, nameOrID string, options entities.GenerateKubeOptions) (*entities.GenerateKubeReport, error) { |