3 files changed, 47 insertions, 5 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index a0c1ec3f0..52d6e32f6 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/containers/storage"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/go-connections/nat"
@@ -81,7 +80,10 @@ func createCmd(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	storageOpts := storage.DefaultStoreOptions
+	storageOpts, err := libpodruntime.GetDefaultStoreOptions()
+	if err != nil {
+		return err
+	}
 	storageOpts.UIDMap = mappings.UIDMap
 	storageOpts.GIDMap = mappings.GIDMap
 
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
index 9ea40e00a..042ce87e5 100644
--- a/cmd/podman/libpodruntime/runtime.go
+++ b/cmd/podman/libpodruntime/runtime.go
@@ -1,6 +1,10 @@
 package libpodruntime
 
 import (
+	"fmt"
+	"os"
+	"path/filepath"
+
 	"github.com/containers/storage"
 	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
@@ -8,10 +12,44 @@ import (
 
 // GetRuntime generates a new libpod runtime configured by command line options
 func GetRuntime(c *cli.Context) (*libpod.Runtime, error) {
-	storageOpts := storage.DefaultStoreOptions
+	storageOpts, err := GetDefaultStoreOptions()
+	if err != nil {
+		return nil, err
+	}
 	return GetRuntimeWithStorageOpts(c, &storageOpts)
 }
 
+func GetRootlessStorageOpts() (storage.StoreOptions, error) {
+	var opts storage.StoreOptions
+
+	opts.RunRoot = filepath.Join(libpod.GetRootlessRuntimeDir(), "run")
+
+	dataDir := os.Getenv("XDG_DATA_DIR")
+	if dataDir != "" {
+		opts.GraphRoot = filepath.Join(dataDir, "containers", "storage")
+	} else {
+		home := os.Getenv("HOME")
+		if home == "" {
+			return opts, fmt.Errorf("HOME not specified")
+		}
+		opts.GraphRoot = filepath.Join(home, ".containers", "storage")
+	}
+	opts.GraphDriverName = "vfs"
+	return opts, nil
+}
+
+func GetDefaultStoreOptions() (storage.StoreOptions, error) {
+	storageOpts := storage.DefaultStoreOptions
+	if os.Getuid() != 0 {
+		var err error
+		storageOpts, err = GetRootlessStorageOpts()
+		if err != nil {
+			return storageOpts, err
+		}
+	}
+	return storageOpts, nil
+}
+
 // GetRuntime generates a new libpod runtime configured by command line options
 func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions) (*libpod.Runtime, error) {
 	options := []libpod.RuntimeOption{}
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 2131df7ab..b7516a233 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/storage"
 	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/projectatomic/libpod/libpod"
@@ -54,7 +53,10 @@ func runCmd(c *cli.Context) error {
 		}
 	}
 
-	storageOpts := storage.DefaultStoreOptions
+	storageOpts, err := libpodruntime.GetDefaultStoreOptions()
+	if err != nil {
+		return err
+	}
 	mappings, err := util.ParseIDMapping(c.StringSlice("uidmap"), c.StringSlice("gidmap"), c.String("subuidmap"), c.String("subgidmap"))
 	if err != nil {
 		return err