From 714e5a13d9586ac6a3a6a1ee1b2ec15a43058350 Mon Sep 17 00:00:00 2001
From: Nirmal Patel <npate012@gmail.com>
Date: Sat, 19 Feb 2022 17:55:23 -0500
Subject: 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>
---
 pkg/api/handlers/libpod/generate.go | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'pkg/api/handlers/libpod')

diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go
index 7e08dd4a8..28785b00d 100644
--- a/pkg/api/handlers/libpod/generate.go
+++ b/pkg/api/handlers/libpod/generate.go
@@ -25,18 +25,15 @@ func GenerateSystemd(w http.ResponseWriter, r *http.Request) {
 		RestartSec       uint     `schema:"restartSec"`
 		StopTimeout      uint     `schema:"stopTimeout"`
 		StartTimeout     uint     `schema:"startTimeout"`
-		ContainerPrefix  string   `schema:"containerPrefix"`
-		PodPrefix        string   `schema:"podPrefix"`
-		Separator        string   `schema:"separator"`
+		ContainerPrefix  *string  `schema:"containerPrefix"`
+		PodPrefix        *string  `schema:"podPrefix"`
+		Separator        *string  `schema:"separator"`
 		Wants            []string `schema:"wants"`
 		After            []string `schema:"after"`
 		Requires         []string `schema:"requires"`
 	}{
-		StartTimeout:    0,
-		StopTimeout:     util.DefaultContainerConfig().Engine.StopTimeout,
-		ContainerPrefix: "container",
-		PodPrefix:       "pod",
-		Separator:       "-",
+		StartTimeout: 0,
+		StopTimeout:  util.DefaultContainerConfig().Engine.StopTimeout,
 	}
 
 	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
@@ -44,6 +41,21 @@ func GenerateSystemd(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	var ContainerPrefix = "container"
+	if query.ContainerPrefix != nil {
+		ContainerPrefix = *query.ContainerPrefix
+	}
+
+	var PodPrefix = "pod"
+	if query.PodPrefix != nil {
+		PodPrefix = *query.PodPrefix
+	}
+
+	var Separator = "-"
+	if query.Separator != nil {
+		Separator = *query.Separator
+	}
+
 	containerEngine := abi.ContainerEngine{Libpod: runtime}
 	options := entities.GenerateSystemdOptions{
 		Name:             query.Name,
@@ -53,9 +65,9 @@ func GenerateSystemd(w http.ResponseWriter, r *http.Request) {
 		RestartPolicy:    query.RestartPolicy,
 		StartTimeout:     &query.StartTimeout,
 		StopTimeout:      &query.StopTimeout,
-		ContainerPrefix:  query.ContainerPrefix,
-		PodPrefix:        query.PodPrefix,
-		Separator:        query.Separator,
+		ContainerPrefix:  ContainerPrefix,
+		PodPrefix:        PodPrefix,
+		Separator:        Separator,
 		RestartSec:       &query.RestartSec,
 		Wants:            query.Wants,
 		After:            query.After,
-- 
cgit v1.2.3-54-g00ecf