summaryrefslogtreecommitdiff
path: root/pkg/systemd/generate/common.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-17 10:34:11 +0100
committerGitHub <noreply@github.com>2022-03-17 10:34:11 +0100
commit6ce967708de95723df92084818274a76c1d7ae16 (patch)
treecf09301df89228e663fa68ef3947c1962fd92d51 /pkg/systemd/generate/common.go
parentb1d37a7e21bfb3e12af2e7cee25dc88ac4f148dd (diff)
parent714e5a13d9586ac6a3a6a1ee1b2ec15a43058350 (diff)
downloadpodman-6ce967708de95723df92084818274a76c1d7ae16.tar.gz
podman-6ce967708de95723df92084818274a76c1d7ae16.tar.bz2
podman-6ce967708de95723df92084818274a76c1d7ae16.zip
Merge pull request #13299 from npate012/fix_systemd_generate_name_on_empty_prefix
Separator is no longer prepended when prefix is empty on podman generate systemd
Diffstat (limited to 'pkg/systemd/generate/common.go')
-rw-r--r--pkg/systemd/generate/common.go14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go
index a6f8f7cd4..e53d37897 100644
--- a/pkg/systemd/generate/common.go
+++ b/pkg/systemd/generate/common.go
@@ -137,3 +137,17 @@ func removeArg(arg string, args []string) []string {
}
return newArgs
}
+
+// This function is used to get name of systemd service from prefix, separator, and
+// container/pod name. If prefix is empty, the service name does not include the
+// separator. This is to avoid a situation where service name starts with the separator
+// which is usually hyphen.
+func getServiceName(prefix string, separator string, name string) string {
+ serviceName := name
+
+ if len(prefix) > 0 {
+ serviceName = prefix + separator + name
+ }
+
+ return serviceName
+}