1 files changed, 69 insertions, 8 deletions

diff --git a/libpod/runtime.go b/libpod/runtime.go
index ffdbc32f1..83799a52b 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -1,6 +1,7 @@
 package libpod
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io/ioutil"
@@ -8,6 +9,8 @@ import (
 	"os/exec"
 	"os/user"
 	"path/filepath"
+	"regexp"
+	"strconv"
 	"strings"
 	"sync"
 	"syscall"
@@ -52,7 +55,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"
@@ -328,16 +331,19 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
 	}, nil
 }
 
-// SetXdgRuntimeDir ensures the XDG_RUNTIME_DIR env variable is set
-// containers/image uses XDG_RUNTIME_DIR to locate the auth file.
-// It internally calls EnableLinger() so that the user's processes are not
+// SetXdgDirs ensures the XDG_RUNTIME_DIR env and XDG_CONFIG_HOME variables are set.
+// containers/image uses XDG_RUNTIME_DIR to locate the auth file, XDG_CONFIG_HOME is
+// use for the libpod.conf configuration file.
+// SetXdgDirs internally calls EnableLinger() so that the user's processes are not
 // killed once the session is terminated.  EnableLinger() also attempts to
 // get the runtime directory when XDG_RUNTIME_DIR is not specified.
-func SetXdgRuntimeDir() error {
+// This function should only be called when running rootless.
+func SetXdgDirs() error {
 	if !rootless.IsRootless() {
 		return nil
 	}
 
+	// Setup XDG_RUNTIME_DIR
 	runtimeDir := os.Getenv("XDG_RUNTIME_DIR")
 
 	runtimeDirLinger, err := rootless.EnableLinger()
@@ -365,6 +371,16 @@ func SetXdgRuntimeDir() error {
 	if err := os.Setenv("XDG_RUNTIME_DIR", runtimeDir); err != nil {
 		return errors.Wrapf(err, "cannot set XDG_RUNTIME_DIR")
 	}
+
+	// Setup XDG_CONFIG_HOME
+	if cfgHomeDir := os.Getenv("XDG_CONFIG_HOME"); cfgHomeDir == "" {
+		if cfgHomeDir, err = util.GetRootlessConfigHomeDir(); err != nil {
+			return err
+		}
+		if err = os.Setenv("XDG_CONFIG_HOME", cfgHomeDir); err != nil {
+			return errors.Wrapf(err, "cannot set XDG_CONFIG_HOME")
+		}
+	}
 	return nil
 }
 
@@ -726,11 +742,43 @@ func getLockManager(runtime *Runtime) (lock.Manager, error) {
 	return manager, nil
 }
 
+// probeConmon calls conmon --version and verifies it is a new enough version for
+// the runtime expectations podman currently has
+func probeConmon(conmonBinary string) error {
+	cmd := exec.Command(conmonBinary, "--version")
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := cmd.Run()
+	if err != nil {
+		return err
+	}
+	r := regexp.MustCompile(`^conmon version (?P<Major>\d+).(?P<Minor>\d+).(?P<Patch>\d+)`)
+
+	matches := r.FindStringSubmatch(out.String())
+	if len(matches) != 4 {
+		return errors.Wrapf(err, "conmon version changed format")
+	}
+	major, err := strconv.Atoi(matches[1])
+	if err != nil || major < 1 {
+		return define.ErrConmonOutdated
+	}
+	// conmon used to be shipped with CRI-O, and was versioned along with it.
+	// even though the conmon that came with crio-1.9 to crio-1.15 has a higher
+	// version number than conmon 1.0.0, 1.0.0 is newer, so we need this check
+	minor, err := strconv.Atoi(matches[2])
+	if err != nil || minor > 9 {
+		return define.ErrConmonOutdated
+	}
+
+	return nil
+}
+
 // Make a new runtime based on the given configuration
 // Sets up containers/storage, state store, OCI runtime
 func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {
 	// Find a working conmon binary
 	foundConmon := false
+	foundOutdatedConmon := false
 	for _, path := range runtime.config.ConmonPath {
 		stat, err := os.Stat(path)
 		if err != nil {
@@ -739,6 +787,11 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {
 		if stat.IsDir() {
 			continue
 		}
+		if err := probeConmon(path); err != nil {
+			logrus.Warnf("conmon at %s invalid: %v", path, err)
+			foundOutdatedConmon = true
+			continue
+		}
 		foundConmon = true
 		runtime.conmonPath = path
 		logrus.Debugf("using conmon: %q", path)
@@ -748,13 +801,21 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {
 	// Search the $PATH as last fallback
 	if !foundConmon {
 		if conmon, err := exec.LookPath("conmon"); err == nil {
-			foundConmon = true
-			runtime.conmonPath = conmon
-			logrus.Debugf("using conmon from $PATH: %q", conmon)
+			if err := probeConmon(conmon); err != nil {
+				logrus.Warnf("conmon at %s is invalid: %v", conmon, err)
+				foundOutdatedConmon = true
+			} else {
+				foundConmon = true
+				runtime.conmonPath = conmon
+				logrus.Debugf("using conmon from $PATH: %q", conmon)
+			}
 		}
 	}
 
 	if !foundConmon {
+		if foundOutdatedConmon {
+			return errors.Wrapf(define.ErrConmonOutdated, "please update to v1.0.0 or later")
+		}
 		return errors.Wrapf(define.ErrInvalidArg,
 			"could not find a working conmon binary (configured options: %v)",
 			runtime.config.ConmonPath)