From 5015130f7a499a6d982ff53ef6612382279d4f46 Mon Sep 17 00:00:00 2001
From: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Date: Mon, 22 Nov 2021 17:46:03 -0800
Subject: [PATCH] Fix executable file not found when restoring shims

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
---
 runtime/v2/shim_load.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go
index 649a76d7c..569cb24a1 100644
--- a/runtime/v2/shim_load.go
+++ b/runtime/v2/shim_load.go
@@ -114,6 +114,13 @@ func (m *ShimManager) loadShims(ctx context.Context) error {
 			runtime = container.Runtime.Name
 		}
 
+		runtime, err = m.resolveRuntimePath(runtime)
+		if err != nil {
+			bundle.Delete()
+			log.G(ctx).WithError(err).Error("failed to resolve runtime path")
+			continue
+		}
+
 		binaryCall := shimBinary(bundle,
 			shimBinaryConfig{
 				runtime:      runtime,