Merge pull request #24327 from rst0git/pod-restore

Enable pod restore with crun
containers · Oct 21, 2024 · 4319fac · 4319fac · packit-as-a-service · Oct 21, 2024
2 parents e4d6fa7 + 642b61a
commit 4319fac
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/pkg/checkpoint/crutils/checkpoint_restore_utils.go b/pkg/checkpoint/crutils/checkpoint_restore_utils.go
@@ -229,7 +229,18 @@ func CRRuntimeSupportsCheckpointRestore(runtimePath string) bool {
 func CRRuntimeSupportsPodCheckpointRestore(runtimePath string) bool {
 	cmd := exec.Command(runtimePath, "restore", "--lsm-mount-context")
 	out, _ := cmd.CombinedOutput()
-	return bytes.Contains(out, []byte("flag needs an argument"))
+
+	// check for runc
+	if bytes.Contains(out, []byte("flag needs an argument")) {
+		return true
+	}
+
+	// check for crun
+	if bytes.Contains(out, []byte("requires an argument")) {
+		return true
+	}
+
+	return false
 }
 
 // CRGetRuntimeFromArchive extracts the checkpoint metadata from the