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

Merge pull request #10881 from mheon/remove_getstore

Browse Source 
Remove GetStore function from Libpod
This commit is contained in:
OpenShift Merge Robot
2021-07-09 14:21:08 -04:00
committed by GitHub
parent dd2ca4bad4 e5fcffc551
commit 24a5eeafc5
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/runtime.go
View File

@ -946,9 +946,12 @@ func (r *Runtime) StorageConfig() storage.StoreOptions {
return r.storageConfig return r.storageConfig
} }
// GetStore returns the runtime stores // RunRoot retrieves the current c/storage temporary directory in use by Libpod.
func (r *Runtime) GetStore() storage.Store { func (r *Runtime) RunRoot() string {
return r.store if r.store == nil {
return ""
}
return r.store.RunRoot()
} }
// GetName retrieves the name associated with a given full ID. // GetName retrieves the name associated with a given full ID.

7
pkg/systemd/generate/containers.go
View File

@ -160,16 +160,11 @@ func generateContainerInfo(ctr *libpod.Container, options entities.GenerateSyste
nameOrID, serviceName := containerServiceName(ctr, options) nameOrID, serviceName := containerServiceName(ctr, options)
store := ctr.Runtime().GetStore()
if store == nil {
return nil, errors.Errorf("could not determine storage store for container")
}
var runRoot string var runRoot string
if options.New { if options.New {
runRoot = "%t/containers" runRoot = "%t/containers"
} else { } else {
runRoot = store.RunRoot() runRoot = ctr.Runtime().RunRoot()
if runRoot == "" { if runRoot == "" {
return nil, errors.Errorf("could not lookup container's runroot: got empty string") return nil, errors.Errorf("could not lookup container's runroot: got empty string")
} }