opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-25 09:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1726 from giuseppe/default-to-fuse-overlayfs

Browse Source 
rootless: default to fuse-overlayfs when available
This commit is contained in:
OpenShift Merge Robot
2018-11-09 06:07:32 -08:00
committed by GitHub
parent ace93e6a48 c7926aa7ca
commit e8e16fcc78
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/podman.1.md
View File

@ -56,7 +56,7 @@ Path to the OCI compatible binary used to run containers
**--storage-driver, -s**=**value**
Storage driver. The default storage driver for UID 0 is configured in /etc/containers/storage.conf (`$HOME/.config/containers/storage.conf` in rootless mode), and is *vfs* for other users. The `STORAGE_DRIVER` environment variable overrides the default. The --storage-driver specified driver overrides all.
Storage driver. The default storage driver for UID 0 is configured in /etc/containers/storage.conf (`$HOME/.config/containers/storage.conf` in rootless mode), and is *vfs* for non-root users when *fuse-overlayfs* is not available. The `STORAGE_DRIVER` environment variable overrides the default. The --storage-driver specified driver overrides all.
Overriding this option will cause the *storage-opt* settings in /etc/containers/storage.conf to be ignored. The user must
specify additional options via the `--storage-opt` flag.

8
pkg/util/utils.go
View File

@ -3,6 +3,7 @@ package util
import (
"fmt"
"os"
"os/exec"
"path/filepath"
"strconv"
"strings"
@ -273,7 +274,12 @@ func GetRootlessStorageOpts() (storage.StoreOptions, error) {
dataDir = filepath.Join(resolvedHome, ".local", "share")
}
opts.GraphRoot = filepath.Join(dataDir, "containers", "storage")
opts.GraphDriverName = "vfs"
if path, err := exec.LookPath("fuse-overlayfs"); err == nil {
opts.GraphDriverName = "overlay"
opts.GraphDriverOptions = []string{fmt.Sprintf("overlay.mount_program=%s", path)}
} else {
opts.GraphDriverName = "vfs"
}
return opts, nil
}