summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-08-04 14:04:18 -0500
committerbaude <bbaude@redhat.com>2019-08-04 14:04:18 -0500
commit577b37b716302d68b090c53cf9b03fcd65496820 (patch)
tree9c1959be8693e215001ea32dc050111ff8dc7623
parentd9ea4db396e3a5ee49dc505ea8f0076c2aca515d (diff)
downloadpodman-577b37b716302d68b090c53cf9b03fcd65496820.tar.gz
podman-577b37b716302d68b090c53cf9b03fcd65496820.tar.bz2
podman-577b37b716302d68b090c53cf9b03fcd65496820.zip
honor libpod.conf in /usr/share/containers
we should be looking for the libpod.conf file in /usr/share/containers and not in /usr/local. packages of podman should drop the default libpod.conf in /usr/share. the override remains /etc/containers/ as well. Fixes: #3702 Signed-off-by: baude <bbaude@redhat.com>
-rw-r--r--libpod/runtime.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index ffdbc32f1..b66b68cfd 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -52,7 +52,7 @@ const (
var (
// InstallPrefix is the prefix where podman will be installed.
// It can be overridden at build time.
- installPrefix = "/usr/local"
+ installPrefix = "/usr"
// EtcDir is the sysconfdir where podman should look for system config files.
// It can be overridden at build time.
etcDir = "/etc"