diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-06-05 10:44:16 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-06-05 13:01:57 -0400 |
| commit | c8f57b71a4255938efa23fec37c59181c1c657e4 (patch) | |
| tree | 0195dcfa6421bbb079e2b75918250eb5e7d4a2ae /pkg/specgen/container_validate.go | |
| parent | c448c03269139dabf6f6fa7ff0fedb2291018b2a (diff) | |
| download | podman-c8f57b71a4255938efa23fec37c59181c1c657e4.tar.gz podman-c8f57b71a4255938efa23fec37c59181c1c657e4.tar.bz2 podman-c8f57b71a4255938efa23fec37c59181c1c657e4.zip | |
Fix handling of systemd.
Systemd enablement has to happen on the server side, since we need
check if the image is running systemd.
Also need to make sure user setting the StopSignal is not overriden on the
server side. But if not set and using systemd, we set it correctly.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/container_validate.go')
| -rw-r--r-- | pkg/specgen/container_validate.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index 75da38c0e..2c5891f9a 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -38,7 +38,7 @@ func (s *SpecGenerator) Validate() error { } // systemd values must be true, false, or always if len(s.ContainerBasicConfig.Systemd) > 0 && !util.StringInSlice(strings.ToLower(s.ContainerBasicConfig.Systemd), SystemDValues) { - return errors.Wrapf(ErrInvalidSpecConfig, "SystemD values must be one of %s", strings.Join(SystemDValues, ",")) + return errors.Wrapf(ErrInvalidSpecConfig, "--systemd values must be one of %q", strings.Join(SystemDValues, ", ")) } // |