storage: overlay: only unmount storage home if needed

intelfx · intelfx · commit 30e60e0be6ed · 2025-09-08T22:01:42.000+02:00
Do not attempt to unmount storage home directory if we were not supposed to mount or remount it at all. This is never useful and may also break certain (unsupported) setups. Fixes: containers/podman#27012 Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>
diff --git a/storage/drivers/overlay/overlay.go b/storage/drivers/overlay/overlay.go
@@ -863,7 +863,11 @@ func (d *Driver) Cleanup() error {
 	if anyPresent {
 		return nil
 	}
-	return mount.Unmount(d.home)
+	// Ensure that we do not unmount anything not mounted by us
+	if !d.options.skipMountHome {
+		return mount.Unmount(d.home)
+	}
+	return nil
 }
 
 // pruneStagingDirectories cleans up any staging directory that was leaked.

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,11 @@ func (d *Driver) Cleanup() error {`
`863`	`863`	`if anyPresent {`
`864`	`864`	`return nil`
`865`	`865`	`}`
`866`		`- return mount.Unmount(d.home)`
	`866`	`+ // Ensure that we do not unmount anything not mounted by us`
	`867`	`+ if !d.options.skipMountHome {`
	`868`	`+ return mount.Unmount(d.home)`
	`869`	`+ }`
	`870`	`+ return nil`
`867`	`871`	`}`
`868`	`872`
`869`	`873`	`// pruneStagingDirectories cleans up any staging directory that was leaked.`