1. docker
  2. Commit bdd9668b489c65eb1ef7272d38ad877ffda2041c
Browse code

Merge pull request #35483 from thaJeztah/disallow-nfs-backing-for-overlay

Disallow overlay/overlay2 on top of NFS

Tõnis Tiigi authored on 2017/11/30 12:24:58
Showing 2 changed files
daemon/graphdriver/overlay/overlay.go
History View file @ bdd9668
... ... 
@@ -128,7 +128,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
128 128 
 	}
129 129
130 130 
 	switch fsMagic {
131 
-	case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicZfs, graphdriver.FsMagicEcryptfs:
131 
+	case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicZfs, graphdriver.FsMagicEcryptfs, graphdriver.FsMagicNfsFs:
132 132 
 		logrus.Errorf("'overlay' is not supported over %s", backingFs)
133 133 
 		return nil, graphdriver.ErrIncompatibleFS
134 134 
 	}
daemon/graphdriver/overlay2/overlay.go
History View file @ bdd9668
... ... 
@@ -146,7 +146,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
146 146
147 147 
 	// check if they are running over btrfs, aufs, zfs, overlay, or ecryptfs
148 148 
 	switch fsMagic {
149 
-	case graphdriver.FsMagicAufs, graphdriver.FsMagicZfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicEcryptfs:
149 
+	case graphdriver.FsMagicAufs, graphdriver.FsMagicZfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicEcryptfs, graphdriver.FsMagicNfsFs:
150 150 
 		logrus.Errorf("'overlay2' is not supported over %s", backingFs)
151 151 
 		return nil, graphdriver.ErrIncompatibleFS
152 152 
 	case graphdriver.FsMagicBtrfs: