diff options
author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-21 17:57:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-21 17:57:24 +0000 |
commit | fe974101ebc30d7902d29daa2e7832e61041f46e (patch) | |
tree | 3736a7b2920d2d0abff3393268dc9d556f2a06a7 /cmd/podman/common/create.go | |
parent | b8b0fa80454fe0f3bcdab24bbf17cf0b6c2e8661 (diff) | |
parent | f451b68dfa71d3690d49bc0cf3536b77cd6572d0 (diff) | |
download | podman-fe974101ebc30d7902d29daa2e7832e61041f46e.tar.gz podman-fe974101ebc30d7902d29daa2e7832e61041f46e.tar.bz2 podman-fe974101ebc30d7902d29daa2e7832e61041f46e.zip |
Merge pull request #14625 from cdoern/podShm
podman pod create --shm-size
Diffstat (limited to 'cmd/podman/common/create.go')
-rw-r--r-- | cmd/podman/common/create.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index 40bb0df78..e25bdd241 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -452,13 +452,6 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions, ) _ = cmd.RegisterFlagCompletionFunc(secretFlagName, AutocompleteSecrets) - shmSizeFlagName := "shm-size" - createFlags.String( - shmSizeFlagName, shmSize(), - "Size of /dev/shm "+sizeWithUnitFormat, - ) - _ = cmd.RegisterFlagCompletionFunc(shmSizeFlagName, completion.AutocompleteNone) - stopSignalFlagName := "stop-signal" createFlags.StringVar( &cf.StopSignal, @@ -628,6 +621,13 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions, ) } if isInfra || (!clone && !isInfra) { // infra container flags, create should also pick these up + shmSizeFlagName := "shm-size" + createFlags.String( + shmSizeFlagName, shmSize(), + "Size of /dev/shm "+sizeWithUnitFormat, + ) + _ = cmd.RegisterFlagCompletionFunc(shmSizeFlagName, completion.AutocompleteNone) + sysctlFlagName := "sysctl" createFlags.StringSliceVar( &cf.Sysctl, |