opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11405 from Luap99/systemd-arg-case

Browse Source 
make podman run --systemd case insensitive
This commit is contained in:
OpenShift Merge Robot
2021-09-02 10:09:16 -04:00
committed by GitHub
parent a8b8ccdc16 a077335ce5
commit afa9987f87
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/specgenutil/specgen.go
View File

@ -453,7 +453,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions
s.ImageVolumeMode = "anonymous" s.ImageVolumeMode = "anonymous"
} }
s.Systemd = c.Systemd s.Systemd = strings.ToLower(c.Systemd)
s.SdNotifyMode = c.SdNotifyMode s.SdNotifyMode = c.SdNotifyMode
if s.ResourceLimits == nil { if s.ResourceLimits == nil {
s.ResourceLimits = &specs.LinuxResources{} s.ResourceLimits = &specs.LinuxResources{}

17
test/e2e/systemd_test.go
View File

@ -176,4 +176,21 @@ WantedBy=multi-user.target
Expect(session.OutputToString()).To(Not(ContainSubstring("noexec"))) 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"))
})
}) })