瀏覽代碼

Merge pull request #40650 from tao12345666333/fix-backingFs

fix backingFs assignment
Akihiro Suda 5 年之前
父節點
當前提交
19dcaf63cb
共有 2 個文件被更改,包括 16 次插入0 次删除
  1. 8 0
      daemon/graphdriver/overlay/overlay.go
  2. 8 0
      daemon/graphdriver/overlay2/overlay.go

+ 8 - 0
daemon/graphdriver/overlay/overlay.go

@@ -136,6 +136,14 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
 		return nil, graphdriver.ErrNotSupported
 		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)
 	supportsDType, err := fsutils.SupportsDType(testdir)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err

+ 8 - 0
daemon/graphdriver/overlay2/overlay.go

@@ -145,6 +145,14 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
 		return nil, graphdriver.ErrNotSupported
 		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)
 	supportsDType, err := fsutils.SupportsDType(testdir)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err