Merge pull request #1809 from lsm5/crun-vm

containers.conf: add crun-vm as a runtime

common/docs/containers.conf.5.md

@@ -761,9 +761,9 @@ Indicates whether the application should be running in remote mode. This flag mo
 
 Default OCI specific runtime in runtimes that will be used by default. Must
 refer to a member of the runtimes table. Default runtime will be searched for
-on the system using the priority: "crun", "runc", "kata".
+on the system using the priority: "crun", "crun-vm", "runc", "kata".
 
-**runtime_supports_json**=["crun", "runc", "kata", "runsc", "youki", "krun"]
+**runtime_supports_json**=["crun", "crun-vm", "runc", "kata", "runsc", "youki", "krun"]
 
 The list of the OCI runtimes that support `--format=json`.
 
@@ -771,7 +771,7 @@ The list of the OCI runtimes that support `--format=json`.
 
 The list of OCI runtimes that support running containers with KVM separation.
 
-**runtime_supports_nocgroups**=["crun", "krun"]
+**runtime_supports_nocgroups**=["crun", "crun-vm", "krun"]
 
 The list of OCI runtimes that support running containers without CGroups.
 

common/pkg/config/config_test.go

@@ -223,6 +223,14 @@ image_copy_tmp_dir="storage"`
 					"/usr/bin/crun",
 					"/usr/local/bin/crun",
 				},
+				"crun-vm": {
+					"/usr/bin/crun-vm",
+					"/usr/local/bin/crun-vm",
+					"/usr/local/sbin/crun-vm",
+					"/sbin/crun-vm",
+					"/bin/crun-vm",
+					"/run/current-system/sw/bin/crun-vm",
+				},
 				"crun-wasm": {
 					"/usr/bin/crun-wasm",
 					"/usr/sbin/crun-wasm",

common/pkg/config/containers.conf

@@ -737,6 +737,15 @@ default_sysctls = [
 #  "/run/current-system/sw/bin/crun",
 #]
 
+#crun-vm = [
+#  "/usr/bin/crun-vm",
+#  "/usr/local/bin/crun-vm",
+#  "/usr/local/sbin/crun-vm",
+#  "/sbin/crun-vm",
+#  "/bin/crun-vm",
+#  "/run/current-system/sw/bin/crun-vm",
+#]
+
 #kata = [
 #  "/usr/bin/kata-runtime",
 #  "/usr/sbin/kata-runtime",

common/pkg/config/default.go

@@ -364,6 +364,14 @@ func defaultEngineConfig() (*EngineConfig, error) {
 			"/bin/crun",
 			"/run/current-system/sw/bin/crun",
 		},
+		"crun-vm": {
+			"/usr/bin/crun-vm",
+			"/usr/local/bin/crun-vm",
+			"/usr/local/sbin/crun-vm",
+			"/sbin/crun-vm",
+			"/bin/crun-vm",
+			"/run/current-system/sw/bin/crun-vm",
+		},
 		"crun-wasm": {
 			"/usr/bin/crun-wasm",
 			"/usr/sbin/crun-wasm",