diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-04 12:19:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 12:19:48 -0800 |
| commit | b81f640bb5a821a1f44b6899a01d9523a38ec351 (patch) | |
| tree | c2e95941146437198d5a02ee8d6fc4df94f076a8 /libpod/container_internal_linux.go | |
| parent | a01a590ae8ea817ff38c30cf4b534c17584aaec2 (diff) | |
| parent | a4b483c8484bb6fb9ae487264bccc663f007e711 (diff) | |
| download | podman-b81f640bb5a821a1f44b6899a01d9523a38ec351.tar.gz podman-b81f640bb5a821a1f44b6899a01d9523a38ec351.tar.bz2 podman-b81f640bb5a821a1f44b6899a01d9523a38ec351.zip | |
Merge pull request #1920 from wking/explicit-hooks-dirs
libpod/container_internal: Deprecate implicit hook directories
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 8861d7728..780bf5279 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -224,10 +224,8 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { } } - if !rootless.IsRootless() { - if c.state.ExtensionStageHooks, err = c.setupOCIHooks(ctx, g.Config); err != nil { - return nil, errors.Wrapf(err, "error setting up OCI Hooks") - } + if c.state.ExtensionStageHooks, err = c.setupOCIHooks(ctx, g.Config); err != nil { + return nil, errors.Wrapf(err, "error setting up OCI Hooks") } // Bind builtin image volumes |