diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-27 20:55:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:55:48 +0100 |
| commit | 3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2 (patch) | |
| tree | d085118d9cf28ed6a8a7b40c1bd6bb5b772b10cc /pkg/domain/infra | |
| parent | 1fe2fbb42114b9072a1caf359beff63042df90fd (diff) | |
| parent | 4352d585490f6c1eb7234ef4f92e0157083d69b3 (diff) | |
| download | podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.tar.gz podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.tar.bz2 podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.zip | |
Merge pull request #4698 from rhatdan/containers.conf
Add support for containers.conf
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index 730ded2e0..d59759707 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -220,9 +220,6 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo if !opts.withFDS { options = append(options, libpod.WithEnableSDNotify()) } - if fs.Changed("config") { - return libpod.NewRuntimeFromConfig(ctx, opts.flags.Config, options...) - } return libpod.NewRuntime(ctx, options...) } |