From 18c22f5bc1a30d325ed7a14d118c8fcf20f2f509 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Tue, 10 Mar 2020 00:03:59 +0800 Subject: [PATCH] fix backingFs assignment Signed-off-by: Jintao Zhang --- daemon/graphdriver/overlay/overlay.go | 8 ++++++++ daemon/graphdriver/overlay2/overlay.go | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go index a7a53387ac..e837a595e1 100644 --- a/daemon/graphdriver/overlay/overlay.go +++ b/daemon/graphdriver/overlay/overlay.go @@ -136,6 +136,14 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap return nil, graphdriver.ErrNotSupported } + fsMagic, err := graphdriver.GetFSMagic(testdir) + if err != nil { + return nil, err + } + if fsName, ok := graphdriver.FsNames[fsMagic]; ok { + backingFs = fsName + } + supportsDType, err := fsutils.SupportsDType(testdir) if err != nil { return nil, err diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index 7bb321f5f4..23ec685aa9 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/daemon/graphdriver/overlay2/overlay.go @@ -145,6 +145,14 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap return nil, graphdriver.ErrNotSupported } + fsMagic, err := graphdriver.GetFSMagic(testdir) + if err != nil { + return nil, err + } + if fsName, ok := graphdriver.FsNames[fsMagic]; ok { + backingFs = fsName + } + supportsDType, err := fsutils.SupportsDType(testdir) if err != nil { return nil, err