From e11d2aaf971dfcb81a307fcab58bb4daa9431284 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 12 May 2021 10:57:12 +0200
Subject: [PATCH] overlay: honor DisableShifting

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 drivers/overlay/overlay.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go
index 7b6b5a66f7..aed3899f8f 100644
--- a/drivers/overlay/overlay.go
+++ b/drivers/overlay/overlay.go
@@ -1155,6 +1155,10 @@ func (d *Driver) get(id string, disableShifting bool, options graphdriver.MountO
 	}
 	readWrite := true
 
+	if !d.SupportsShifting() || options.DisableShifting {
+		disableShifting = true
+	}
+
 	optsList := options.Options
 	if len(optsList) == 0 {
 		optsList = strings.Split(d.options.mountOptions, ",")