overlay: allow unknown backing fs with mountProgram

giuseppe · giuseppe · commit b9f1697c1714 · 2023-02-22T10:40:16.000+01:00
if a mountProgram is specified, let it deal with an unknown backing file system instead of failing early. The error is kept when we use native overlay. Closes: #1511 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go
@@ -315,7 +315,10 @@ func Init(home string, options graphdriver.Options) (graphdriver.Driver, error)
 	}
 	fsName, ok := graphdriver.FsNames[fsMagic]
 	if !ok {
-		return nil, fmt.Errorf("filesystem type %#x reported for %s is not supported with 'overlay': %w", fsMagic, filepath.Dir(home), graphdriver.ErrIncompatibleFS)
+		if opts.mountProgram == "" {
+			return nil, fmt.Errorf("filesystem type %#x reported for %s is not supported with 'overlay': %w", fsMagic, filepath.Dir(home), graphdriver.ErrIncompatibleFS)
+		}
+		fsName = "<unknown>"
 	}
 	backingFs = fsName
 

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,10 @@ func Init(home string, options graphdriver.Options) (graphdriver.Driver, error)`
`315`	`315`	`}`
`316`	`316`	`fsName, ok := graphdriver.FsNames[fsMagic]`
`317`	`317`	`if !ok {`
`318`		`- return nil, fmt.Errorf("filesystem type %#x reported for %s is not supported with 'overlay': %w", fsMagic, filepath.Dir(home), graphdriver.ErrIncompatibleFS)`
	`318`	`+ if opts.mountProgram == "" {`
	`319`	`+ return nil, fmt.Errorf("filesystem type %#x reported for %s is not supported with 'overlay': %w", fsMagic, filepath.Dir(home), graphdriver.ErrIncompatibleFS)`
	`320`	`+ }`
	`321`	`+ fsName = "<unknown>"`
`319`	`322`	`}`
`320`	`323`	`backingFs = fsName`
`321`	`324`