opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1698 from rhatdan/man

Browse Source 
Fix man page to show info on storage
This commit is contained in:
OpenShift Merge Robot
2018-10-22 14:33:05 -07:00
committed by GitHub
parent f3b0837974 3157595288
commit 5b2478ed87
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/podman.1.md
View File

@ -42,11 +42,13 @@ When namespace is set, created containers and pods will join the given namespace
**--root**=**value** **--root**=**value**
Path to the root directory in which data, including images, is stored Storage root dir in which data, including images, is stored (default: "/var/lib/containers/storage" for UID 0, "$HOME/.local/share/containers/storage" for other users).
Default root dir is configured in /etc/containers/storage.conf.
**--runroot**=**value** **--runroot**=**value**
Path to the 'run directory' where all state information is stored Storage state directory where all state information is stored (default: "/var/run/containers/storage" for UID 0, "/var/run/user/$UID/run" for other users).
Default state dir is configured in /etc/containers/storage.conf.
**--runtime**=**value** **--runtime**=**value**

2
pkg/util/utils.go
View File

@ -248,6 +248,7 @@ func GetRootlessRuntimeDir() (string, error) {
return runtimeDir, nil return runtimeDir, nil
} }
// GetRootlessStorageOpts returns the storage ops for containers running as non root
func GetRootlessStorageOpts() (storage.StoreOptions, error) { func GetRootlessStorageOpts() (storage.StoreOptions, error) {
var opts storage.StoreOptions var opts storage.StoreOptions
@ -276,6 +277,7 @@ func GetRootlessStorageOpts() (storage.StoreOptions, error) {
return opts, nil return opts, nil
} }
// GetDefaultStoreOptions returns the storage ops for containers
func GetDefaultStoreOptions() (storage.StoreOptions, error) { func GetDefaultStoreOptions() (storage.StoreOptions, error) {
storageOpts := storage.DefaultStoreOptions storageOpts := storage.DefaultStoreOptions
if rootless.IsRootless() { if rootless.IsRootless() {