storage: allow to override .fuse_program from the conf file

Signed-off-by: Giuseppe Scrivano <[email protected]>

storage.conf

@@ -25,6 +25,11 @@ additionalimagestores = [
 # certain container storage drivers.
 size = ""
 
+# Path to a FUSE helper to use for mounting the file system instead of mounting it
+# directly.
+#fuse_program = "/usr/bin/fuse-overlayfs"
+
+
 # OverrideKernelCheck tells the driver to ignore kernel checks based on kernel version
 override_kernel_check = "false"
 

store.go

@@ -2992,6 +2992,9 @@ type OptionsConfig struct {
 
 	// Do not create a bind mount on the storage home
 	SkipMountHome string `toml:"skip_mount_home"`
+
+	// Alternative program to use for the mount of the file system
+	FuseProgram string `toml:"fuse_program"`
 }
 
 // TOML-friendly explicit tables used for conversions.
@@ -3084,6 +3087,9 @@ func ReloadConfigurationFile(configFile string, storeOptions *StoreOptions) {
 	if config.Storage.Options.SkipMountHome != "" {
 		storeOptions.GraphDriverOptions = append(storeOptions.GraphDriverOptions, fmt.Sprintf("%s.skip_mount_home=%s", config.Storage.Driver, config.Storage.Options.SkipMountHome))
 	}
+	if config.Storage.Options.FuseProgram != "" {
+		storeOptions.GraphDriverOptions = append(storeOptions.GraphDriverOptions, fmt.Sprintf("%s.fuse_program=%s", config.Storage.Driver, config.Storage.Options.FuseProgram))
+	}
 	if config.Storage.Options.OverrideKernelCheck != "" {
 		storeOptions.GraphDriverOptions = append(storeOptions.GraphDriverOptions, fmt.Sprintf("%s.override_kernel_check=%s", config.Storage.Driver, config.Storage.Options.OverrideKernelCheck))
 	}