aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-29 16:39:08 +0200
committerGitHub <noreply@github.com>2019-07-29 16:39:08 +0200
commit6665269ab8bd413799df6568a83a3ac679c93ad1 (patch)
treecc8c96bf8082c000b4848abc3e3b55e7c3871f77
parent2ca7861b8e9d375711af6fbf96d3148256b10d48 (diff)
parent317a5c72c6bff47be1c562222995745a7159d6de (diff)
downloadpodman-6665269ab8bd413799df6568a83a3ac679c93ad1.tar.gz
podman-6665269ab8bd413799df6568a83a3ac679c93ad1.tar.bz2
podman-6665269ab8bd413799df6568a83a3ac679c93ad1.zip
Merge pull request #3233 from wking/fatal-requested-hook-directory-does-not-exist
libpod/container_internal: Make all errors loading explicitly configured hook dirs fatal
-rw-r--r--libpod/container_internal.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 36732685b..83ee5640e 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1474,10 +1474,6 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (exten
} else {
manager, err := hooks.New(ctx, c.runtime.config.HooksDir, []string{"precreate", "poststop"})
if err != nil {
- if os.IsNotExist(err) {
- logrus.Warnf("Requested OCI hooks directory %q does not exist", c.runtime.config.HooksDir)
- return nil, nil
- }
return nil, err
}