From faf3c75d8f7489e94519149c6c047eafb51b4f69 Mon Sep 17 00:00:00 2001
From: Doug Rabson <dfr@rabson.org>
Date: Tue, 26 Apr 2022 15:29:28 +0100
Subject: [PATCH] Add runj which is an experimental OCI runtime based on
 FreeBSD jails

Signed-off-by: Doug Rabson <dfr@rabson.org>
---
 common/pkg/config/config.go      | 2 +-
 common/pkg/config/config_test.go | 3 +++
 common/pkg/config/default.go     | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/pkg/config/config.go b/common/pkg/config/config.go
index ebd02e9a11..897ee531bc 100644
--- a/common/pkg/config/config.go
+++ b/common/pkg/config/config.go
@@ -803,7 +803,7 @@ func (c *Config) Validate() error {
 
 func (c *EngineConfig) findRuntime() string {
 	// Search for crun first followed by runc, kata, runsc
-	for _, name := range []string{"crun", "runc", "kata", "runsc"} {
+	for _, name := range []string{"crun", "runc", "runj", "kata", "runsc"} {
 		for _, v := range c.OCIRuntimes[name] {
 			if _, err := os.Stat(v); err == nil {
 				return name
diff --git a/common/pkg/config/config_test.go b/common/pkg/config/config_test.go
index 451544797b..2eb49ea9a0 100644
--- a/common/pkg/config/config_test.go
+++ b/common/pkg/config/config_test.go
@@ -173,6 +173,9 @@ image_copy_tmp_dir="storage"`
 					"/bin/runc",
 					"/usr/lib/cri-o-runc/sbin/runc",
 				},
+				"runj": {
+					"/usr/local/bin/runj",
+				},
 				"crun": {
 					"/usr/bin/crun",
 					"/usr/local/bin/crun",
diff --git a/common/pkg/config/default.go b/common/pkg/config/default.go
index 8979a406bc..84180febc1 100644
--- a/common/pkg/config/default.go
+++ b/common/pkg/config/default.go
@@ -323,6 +323,9 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
 			"/usr/lib/cri-o-runc/sbin/runc",
 			"/run/current-system/sw/bin/runc",
 		},
+		"runj": {
+			"/usr/local/bin/runj",
+		},
 		"kata": {
 			"/usr/bin/kata-runtime",
 			"/usr/sbin/kata-runtime",