configuration: new option skip_mount_home

It is needed to use an OSTree repository (either directly or as a parent repository) that is not under the storage home directory. Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Jun 22, 2018 · ec3d1cb · ec3d1cb
1 parent a45772a
commit ec3d1cb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/docs/containers-storage.conf.5.md b/docs/containers-storage.conf.5.md
@@ -128,6 +128,9 @@ Specifies the maximum number of retries XFS should attempt to complete IO when E
 **ostree_repo=""**
   Tell storage drivers to use the specified OSTree repository.  Some storage drivers, such as overlay, might use
 
+**skip_mount_home=""**
+  Tell storage drivers to not create a PRIVATE bind mount on their home directory.
+
 # HISTORY
 May 2017, Originally compiled by Dan Walsh <[email protected]>
 Format copied from crio.conf man page created by Aleksa Sarai <[email protected]>
diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go
@@ -86,6 +86,7 @@ type overlayOptions struct {
 	imageStores         []string
 	quota               quota.Quota
 	ostreeRepo          string
+	skipMountHome       bool
 }
 
 // Driver contains information about the home directory and the list of active mounts that are created using this driver.
@@ -157,8 +158,10 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
 		return nil, errors.Wrap(err, "kernel does not support overlay fs")
 	}
 
-	if err := mount.MakePrivate(home); err != nil {
-		return nil, err
+	if !opts.skipMountHome {
+		if err := mount.MakePrivate(home); err != nil {
+			return nil, err
+		}
 	}
 
 	if opts.ostreeRepo != "" {
@@ -243,6 +246,12 @@ func parseOptions(options []string) (*overlayOptions, error) {
 				return nil, fmt.Errorf("overlay: ostree_repo specified but support for ostree is missing")
 			}
 			o.ostreeRepo = val
+		case "overlay2.skip_mount_home", "overlay.skip_mount_home", ".skip_mount_home":
+			logrus.Debugf("overlay: skip_mount_home=%s", val)
+			o.skipMountHome, err = strconv.ParseBool(val)
+			if err != nil {
+				return nil, err
+			}
 		default:
 			return nil, fmt.Errorf("overlay: Unknown option %s", key)
 		}

diff --git a/storage.conf b/storage.conf
@@ -123,3 +123,7 @@ override_kernel_check = "false"
 
 # If specified, use OSTree to deduplicate files with the overlay backend
 ostree_repo = ""
+
+# Set to skip a PRIVATE bind mount on the storage home directory.  Only supported by
+# certain container storage drivers
+skip_mount_home = "false"
diff --git a/store.go b/store.go
@@ -2989,6 +2989,9 @@ type OptionsConfig struct {
 	Thinpool struct{ ThinpoolOptionsConfig } `toml:"thinpool"`
 	// OSTree repository
 	OstreeRepo string `toml:"ostree_repo"`
+
+	// Do not create a bind mount on the storage home
+	SkipMountHome string `toml:"skip_mount_home"`
 }
 
 // TOML-friendly explicit tables used for conversions.
@@ -3082,6 +3085,9 @@ func init() {
 	if config.Storage.Options.OstreeRepo != "" {
 		DefaultStoreOptions.GraphDriverOptions = append(DefaultStoreOptions.GraphDriverOptions, fmt.Sprintf("%s.ostree_repo=%s", config.Storage.Driver, config.Storage.Options.OstreeRepo))
 	}
+	if config.Storage.Options.SkipMountHome != "" {
+		DefaultStoreOptions.GraphDriverOptions = append(DefaultStoreOptions.GraphDriverOptions, fmt.Sprintf("%s.skip_mount_home=%s", config.Storage.Driver, config.Storage.Options.SkipMountHome))
+	}
 	if config.Storage.Options.OverrideKernelCheck != "" {
 		DefaultStoreOptions.GraphDriverOptions = append(DefaultStoreOptions.GraphDriverOptions, fmt.Sprintf("%s.override_kernel_check=%s", config.Storage.Driver, config.Storage.Options.OverrideKernelCheck))
 	}