container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-19 16:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix man page to show info on storage

Browse source 
Also fix lint errors.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2018-10-22 13:30:08 -04:00
parent f3b0837974
commit 3157595288
No known key found for this signature in database
GPG key ID: A2DF901DABE2C028
2 changed files with 6 additions and 2 deletions
Show stats 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**
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**

2
pkg/util/utils.go
View file

@ -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() {