summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-24 14:45:01 +0200
committerGitHub <noreply@github.com>2019-07-24 14:45:01 +0200
commit2283471f8da7c3dc1a2cc6e1fe908c0fe7596d68 (patch)
tree76a8181377a3e789c40dc914534c9ba1f9b38bc9
parent091778354efa2d61e86ec9eea9323fa7809875c8 (diff)
parent5fb4feb36a2378298d54b00150add1097a6acb4c (diff)
downloadpodman-2283471f8da7c3dc1a2cc6e1fe908c0fe7596d68.tar.gz
podman-2283471f8da7c3dc1a2cc6e1fe908c0fe7596d68.tar.bz2
podman-2283471f8da7c3dc1a2cc6e1fe908c0fe7596d68.zip
Merge pull request #3626 from mheon/fix_ps_segfault
Fix a segfault on Podman no-store commands with refresh
-rw-r--r--libpod/runtime.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 08c6cb588..28958e932 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -879,14 +879,6 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {
runtime.imageRuntime.Eventer = eventer
}
- // Set up a storage service for creating container root filesystems from
- // images
- storageService, err := getStorageService(runtime.store)
- if err != nil {
- return err
- }
- runtime.storageService = storageService
-
// Set up containers/image
runtime.imageContext = &types.SystemContext{
SignaturePolicyPath: runtime.config.SignaturePolicyPath,
@@ -1330,6 +1322,14 @@ func (r *Runtime) configureStore() error {
r.store = store
is.Transport.SetStore(store)
+ // Set up a storage service for creating container root filesystems from
+ // images
+ storageService, err := getStorageService(r.store)
+ if err != nil {
+ return err
+ }
+ r.storageService = storageService
+
ir := image.NewImageRuntimeFromStore(r.store)
ir.SignaturePolicyPath = r.config.SignaturePolicyPath
ir.EventsLogFilePath = r.config.EventsLogFilePath