diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-29 14:59:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 14:59:16 +0000 |
| commit | bf10168614b35dbcfefff01ed63ee90b39cae8d7 (patch) | |
| tree | 7dd5af66ff89ad60a8481f9e97e7eb50fcbcf06d /cmd/podman | |
| parent | 84dede4452d4f85ad6dacf2c66e00500685c24af (diff) | |
| parent | 0d70df119539d818224b0d014602aaad2bd1b95e (diff) | |
| download | podman-bf10168614b35dbcfefff01ed63ee90b39cae8d7.tar.gz podman-bf10168614b35dbcfefff01ed63ee90b39cae8d7.tar.bz2 podman-bf10168614b35dbcfefff01ed63ee90b39cae8d7.zip | |
Merge pull request #7811 from rhatdan/sysctls
Ignore containers.conf sysctl when namespaces set to host
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/common/create.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index bb4726817..4efdf1164 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -448,7 +448,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { createFlags.StringSliceVar( &cf.Sysctl, - "sysctl", containerConfig.Sysctls(), + "sysctl", []string{}, "Sysctl options", ) createFlags.StringVar( |