erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-12 00:47:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Special case memory-swap=-1

Browse source 
We document that memory-swap==-1 means unlimited, but currently we
won't allow the user to specify the -1 value.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2020-02-05 10:37:02 -05:00
parent 537352cc3e
commit 100d2fdcfd
No known key found for this signature in database
GPG key ID: A2DF901DABE2C028
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/podman/shared/create.go
View file

@ -309,9 +309,13 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
}
}
if c.String("memory-swap") != "" {
memorySwap, err = units.RAMInBytes(c.String("memory-swap"))
if err != nil {
return nil, errors.Wrapf(err, "invalid value for memory-swap")
if c.String("memory-swap") == "-1" {
memorySwap = -1
} else {
memorySwap, err = units.RAMInBytes(c.String("memory-swap"))
if err != nil {
return nil, errors.Wrapf(err, "invalid value for memory-swap")
}
}
}
if c.String("kernel-memory") != "" {