diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-22 13:44:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-22 13:44:43 -0500 |
commit | a6e7d19c463a55a7d3bf6e47faec1906f3f32380 (patch) | |
tree | 3d3ef05a6bd448177c737cf0d6ba92ededd84934 /pkg/domain | |
parent | f8ff1727eca1ca726f00f5509fae5d9ca024f516 (diff) | |
parent | d2f3098c6f9068edfe4012387cef2e6d140ef20a (diff) | |
download | podman-a6e7d19c463a55a7d3bf6e47faec1906f3f32380.tar.gz podman-a6e7d19c463a55a7d3bf6e47faec1906f3f32380.tar.bz2 podman-a6e7d19c463a55a7d3bf6e47faec1906f3f32380.zip |
Merge pull request #9445 from jmguzik/no-header-info-for-systemd-generation
No header info for systemd generation
Diffstat (limited to 'pkg/domain')
-rw-r--r-- | pkg/domain/entities/generate.go | 2 | ||||
-rw-r--r-- | pkg/domain/infra/tunnel/generate.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/entities/generate.go b/pkg/domain/entities/generate.go index 4a0d7537e..3ec713edf 100644 --- a/pkg/domain/entities/generate.go +++ b/pkg/domain/entities/generate.go @@ -18,6 +18,8 @@ type GenerateSystemdOptions struct { PodPrefix string // Separator - systemd unit name separator between name/id and prefix Separator string + // NoHeader - skip header generation + NoHeader bool } // GenerateSystemdReport diff --git a/pkg/domain/infra/tunnel/generate.go b/pkg/domain/infra/tunnel/generate.go index 2484574a7..0e768b30b 100644 --- a/pkg/domain/infra/tunnel/generate.go +++ b/pkg/domain/infra/tunnel/generate.go @@ -8,7 +8,7 @@ import ( ) func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string, opts entities.GenerateSystemdOptions) (*entities.GenerateSystemdReport, error) { - options := new(generate.SystemdOptions).WithUseName(opts.Name).WithContainerPrefix(opts.ContainerPrefix).WithNew(opts.New) + options := new(generate.SystemdOptions).WithUseName(opts.Name).WithContainerPrefix(opts.ContainerPrefix).WithNew(opts.New).WithNoHeader(opts.NoHeader) options.WithPodPrefix(opts.PodPrefix).WithRestartPolicy(opts.RestartPolicy).WithSeparator(opts.Separator) if to := opts.StopTimeout; to != nil { options.WithStopTimeout(*opts.StopTimeout) |