From 709ad91035ecaff05159065126b207dd0f482b55 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Thu, 7 Nov 2019 08:17:46 +0000
Subject: libpod/config: default: use `crun` on Cgroups v2

When running on a node with Cgroups v2, default to using `crun` instead
of `runc`.  Note that this only impacts the hard-coded default config.
No user config will be over-written.

Fixes: #4463
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 libpod.conf | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'libpod.conf')

diff --git a/libpod.conf b/libpod.conf
index 47f66ecc1..ef7c101a6 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -142,8 +142,13 @@ runc = [
 ]
 
 crun = [
-	    "/usr/bin/crun",
-	    "/usr/local/bin/crun",
+		"/usr/bin/crun",
+		"/usr/sbin/crun",
+		"/usr/local/bin/crun",
+		"/usr/local/sbin/crun",
+		"/sbin/crun",
+		"/bin/crun",
+		"/run/current-system/sw/bin/crun",
 ]
 
 # The [runtimes] table MUST be the last thing in this file.
-- 
cgit v1.2.3-54-g00ecf