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

Merge pull request #5098 from rhatdan/memory-swap

Browse Source 
Special case memory-swap=-1
This commit is contained in:
OpenShift Merge Robot
2020-02-06 18:51:05 +01:00
committed by GitHub
parent f2fe37ea67 100d2fdcfd
commit 62111bceb7
1 changed files with 7 additions and 3 deletions
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") != "" {