diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-02 10:09:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 10:09:16 -0400 |
| commit | afa9987f876b08647e419e798a738f0f98e47600 (patch) | |
| tree | 25ede6cd8eef4669fef06c7bf93a19d0e5b459ff | |
| parent | a8b8ccdc166519270044a7bd1f9d04018eb5044b (diff) | |
| parent | a077335ce50c53bca945656f49d64ac34bfee638 (diff) | |
| download | podman-afa9987f876b08647e419e798a738f0f98e47600.tar.gz podman-afa9987f876b08647e419e798a738f0f98e47600.tar.bz2 podman-afa9987f876b08647e419e798a738f0f98e47600.zip | |
Merge pull request #11405 from Luap99/systemd-arg-case
make podman run --systemd case insensitive
| -rw-r--r-- | pkg/specgenutil/specgen.go | 2 | ||||
| -rw-r--r-- | test/e2e/systemd_test.go | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index 9f676db1b..6a6397257 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -453,7 +453,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions s.ImageVolumeMode = "anonymous" } - s.Systemd = c.Systemd + s.Systemd = strings.ToLower(c.Systemd) s.SdNotifyMode = c.SdNotifyMode if s.ResourceLimits == nil { s.ResourceLimits = &specs.LinuxResources{} diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 3213a839a..a1b25b723 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -176,4 +176,21 @@ WantedBy=multi-user.target Expect(session.OutputToString()).To(Not(ContainSubstring("noexec"))) }) + + It("podman run --systemd arg is case insensitive", func() { + session := podmanTest.Podman([]string{"run", "--rm", "--systemd", "Always", ALPINE, "echo", "test"}) + session.WaitWithDefaultTimeout() + Expect(session).Should(Exit(0)) + Expect(session.OutputToString()).Should(Equal("test")) + + session = podmanTest.Podman([]string{"run", "--rm", "--systemd", "True", ALPINE, "echo", "test"}) + session.WaitWithDefaultTimeout() + Expect(session).Should(Exit(0)) + Expect(session.OutputToString()).Should(Equal("test")) + + session = podmanTest.Podman([]string{"run", "--rm", "--systemd", "False", ALPINE, "echo", "test"}) + session.WaitWithDefaultTimeout() + Expect(session).Should(Exit(0)) + Expect(session.OutputToString()).Should(Equal("test")) + }) }) |