diff options
| author | Nirmal Patel <npate012@gmail.com> | 2022-02-19 17:55:23 -0500 |
|---|---|---|
| committer | Nirmal Patel <npate012@gmail.com> | 2022-03-16 20:26:59 -0400 |
| commit | 714e5a13d9586ac6a3a6a1ee1b2ec15a43058350 (patch) | |
| tree | cf09301df89228e663fa68ef3947c1962fd92d51 /pkg/systemd/generate/containers.go | |
| parent | b1d37a7e21bfb3e12af2e7cee25dc88ac4f148dd (diff) | |
| download | podman-714e5a13d9586ac6a3a6a1ee1b2ec15a43058350.tar.gz podman-714e5a13d9586ac6a3a6a1ee1b2ec15a43058350.tar.bz2 podman-714e5a13d9586ac6a3a6a1ee1b2ec15a43058350.zip | |
Separator is no longer prepended when prefix is empty on podman generate systemd
When podman generate systemd is invoked, it previously did not check if
container-prefix or pod-prefix are empty. When these are empty, the file name
starts with the separator, which is hyphen by default. This results in files
like '-containername.service'.
The code now checks if these prefixes are empty. If they are, the filename no
longer adds a separator. Instead, it uses name or ID of the container or pod.
Closes #13272
Signed-off-by: Nirmal Patel <npate012@gmail.com>
Diffstat (limited to 'pkg/systemd/generate/containers.go')
| -rw-r--r-- | pkg/systemd/generate/containers.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index ea829c810..c01bb1baf 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -236,7 +236,9 @@ func containerServiceName(ctr *libpod.Container, options entities.GenerateSystem if options.Name { nameOrID = ctr.Name() } - serviceName := fmt.Sprintf("%s%s%s", options.ContainerPrefix, options.Separator, nameOrID) + + serviceName := getServiceName(options.ContainerPrefix, options.Separator, nameOrID) + return nameOrID, serviceName } |