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/runtime.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libpod') diff --git a/libpod/runtime.go b/libpod/runtime.go index 28958e932..bb6bfbfcc 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -293,6 +293,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) { "/sbin/runc", "/bin/runc", "/usr/lib/cri-o-runc/sbin/runc", + "/run/current-system/sw/bin/runc", }, }, ConmonPath: []string{ @@ -302,6 +303,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) { "/usr/sbin/conmon", "/usr/local/bin/conmon", "/usr/local/sbin/conmon", + "/run/current-system/sw/bin/conmon", }, ConmonEnvVars: []string{ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", -- cgit v1.2.3-54-g00ecf