From c890c03f1bd32df21e0e75c8b97640831f2527e0 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Thu, 2 May 2019 11:25:07 +0800 Subject: [PATCH 11/46] optimize isulad_kit operator get mountpoint from driver Signed-off-by: LiuHao --- vendor/github.com/containers/storage/layers.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vendor/github.com/containers/storage/layers.go b/vendor/github.com/containers/storage/layers.go index e01cf23..4d5b9f8 100644 --- a/vendor/github.com/containers/storage/layers.go +++ b/vendor/github.com/containers/storage/layers.go @@ -952,7 +952,14 @@ func (r *layerStore) Exists(id string) bool { func (r *layerStore) Get(id string) (*Layer, error) { if layer, ok := r.lookup(id); ok { - return copyLayer(layer), nil + result := copyLayer(layer) + data, err := r.driver.Metadata(layer.ID) + if err == nil { + if mergedDir, ok := data["MergedDir"]; ok { + result.MountPoint = mergeDir + } + } + return result, nil } return nil, ErrLayerUnknown } -- 2.19.1