From 52ae51c79fc8a373c37a922ad237229400dbd968 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 29 Jul 2019 10:09:52 +0200 Subject: Update libpod.conf to be NixOS friendly NixOS links the current system state to `/run/current-system`, so we have to add these paths to the configuration files as well to work out of the box. Signed-off-by: Sascha Grunert --- libpod.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libpod.conf') diff --git a/libpod.conf b/libpod.conf index c92f60a10..6dd021c02 100644 --- a/libpod.conf +++ b/libpod.conf @@ -12,7 +12,8 @@ conmon_path = [ "/usr/bin/conmon", "/usr/sbin/conmon", "/usr/local/bin/conmon", - "/usr/local/sbin/conmon" + "/usr/local/sbin/conmon", + "/run/current-system/sw/bin/conmon", ] # Environment variables to pass into conmon @@ -128,7 +129,8 @@ runc = [ "/usr/local/sbin/runc", "/sbin/runc", "/bin/runc", - "/usr/lib/cri-o-runc/sbin/runc" + "/usr/lib/cri-o-runc/sbin/runc", + "/run/current-system/sw/bin/runc", ] crun = [ -- cgit v1.2.3-54-g00ecf