generate systemd: drop support for remote clients

Drop the support for remote clients to generate systemd-service files.
The generated files are machine-dependent and hence relate only to the
a local machine.  Furthermore, a proper service management when using
a remote-client is not possible as systemd has no access to a process.

Dropping the support will also reduce the risk of making users believe
that the generated services are usable in a remote scenario.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

2 files changed, 2 insertions, 23 deletions

diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index 5a26f537f..590fef43f 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -951,7 +951,7 @@ func (r *LocalRuntime) Port(c *cliconfig.PortValues) ([]*Container, error) {
 
 // GenerateSystemd creates a systemd until for a container
 func (r *LocalRuntime) GenerateSystemd(c *cliconfig.GenerateSystemdValues) (string, error) {
-	return iopodman.GenerateSystemd().Call(r.Conn, c.InputArgs[0], c.RestartPolicy, int64(c.StopTimeout), c.Name)
+	return "", errors.New("systemd generation not supported for remote clients")
 }
 
 // GetNamespaces returns namespace information about a container for PS
diff --git a/pkg/varlinkapi/generate.go b/pkg/varlinkapi/generate.go
index 9dc20d582..19010097d 100644
--- a/pkg/varlinkapi/generate.go
+++ b/pkg/varlinkapi/generate.go
@@ -4,9 +4,9 @@ package varlinkapi
 
 import (
 	"encoding/json"
+
 	"github.com/containers/libpod/cmd/podman/shared"
 	iopodman "github.com/containers/libpod/cmd/podman/varlink"
-	"github.com/containers/libpod/pkg/systemdgen"
 )
 
 // GenerateKube ...
@@ -29,24 +29,3 @@ func (i *LibpodAPI) GenerateKube(call iopodman.VarlinkCall, name string, service
 		Service: string(servB),
 	})
 }
-
-// GenerateSystemd ...
-func (i *LibpodAPI) GenerateSystemd(call iopodman.VarlinkCall, nameOrID, restart string, stopTimeout int64, useName bool) error {
-	ctr, err := i.Runtime.LookupContainer(nameOrID)
-	if err != nil {
-		return call.ReplyErrorOccurred(err.Error())
-	}
-	timeout := int(ctr.StopTimeout())
-	if stopTimeout >= 0 {
-		timeout = int(stopTimeout)
-	}
-	name := ctr.ID()
-	if useName {
-		name = ctr.Name()
-	}
-	unit, err := systemdgen.CreateSystemdUnitAsString(name, ctr.ID(), restart, ctr.Config().StaticDir, timeout)
-	if err != nil {
-		return call.ReplyErrorOccurred(err.Error())
-	}
-	return call.ReplyGenerateSystemd(unit)
-}