diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-22 14:33:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-22 14:33:05 -0700 |
commit | 5b2478ed87eedd8178c1672a786f95a6716a8edb (patch) | |
tree | 44a309ede750f9f495e2675212f39e7703c5eff6 | |
parent | f3b08379749e8d09cdec45238486ae0b91b4c6ee (diff) | |
parent | 3157595288d67faefe20ff90bce8feb1f7dedadd (diff) | |
download | podman-5b2478ed87eedd8178c1672a786f95a6716a8edb.tar.gz podman-5b2478ed87eedd8178c1672a786f95a6716a8edb.tar.bz2 podman-5b2478ed87eedd8178c1672a786f95a6716a8edb.zip |
Merge pull request #1698 from rhatdan/man
Fix man page to show info on storage
-rw-r--r-- | docs/podman.1.md | 6 | ||||
-rw-r--r-- | pkg/util/utils.go | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/podman.1.md b/docs/podman.1.md index 81b201940..085af97ff 100644 --- a/docs/podman.1.md +++ b/docs/podman.1.md @@ -42,11 +42,13 @@ When namespace is set, created containers and pods will join the given namespace **--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** -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** diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 71fb10f99..9107eec5c 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -248,6 +248,7 @@ func GetRootlessRuntimeDir() (string, error) { return runtimeDir, nil } +// GetRootlessStorageOpts returns the storage ops for containers running as non root func GetRootlessStorageOpts() (storage.StoreOptions, error) { var opts storage.StoreOptions @@ -276,6 +277,7 @@ func GetRootlessStorageOpts() (storage.StoreOptions, error) { return opts, nil } +// GetDefaultStoreOptions returns the storage ops for containers func GetDefaultStoreOptions() (storage.StoreOptions, error) { storageOpts := storage.DefaultStoreOptions if rootless.IsRootless() { |