aufs,overlay: disable on eCryptfs

unclejack · unclejack · commit 5e85ec82af6c · 2016-06-01T21:00:35.000+03:00
Signed-off-by: Cristian Staretu &lt;cristian.staretu@gmail.com&gt;
diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go
@@ -93,7 +93,7 @@ func Init(root string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
 	}
 
 	switch fsMagic {
-	case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs:
+	case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicEcryptfs:
 		logrus.Errorf("AUFS is not supported over %s", backingFs)
 		return nil, graphdriver.ErrIncompatibleFS
 	}
diff --git a/daemon/graphdriver/driver_linux.go b/daemon/graphdriver/driver_linux.go
@@ -16,6 +16,8 @@ const (
 	FsMagicBtrfs = FsMagic(0x9123683E)
 	// FsMagicCramfs filesystem id for Cramfs
 	FsMagicCramfs = FsMagic(0x28cd3d45)
+	// FsMagicEcryptfs filesystem id for eCryptfs
+	FsMagicEcryptfs = FsMagic(0xf15f)
 	// FsMagicExtfs filesystem id for Extfs
 	FsMagicExtfs = FsMagic(0x0000EF53)
 	// FsMagicF2fs filesystem id for F2fs
diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go
@@ -119,7 +119,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
 	}
 
 	switch fsMagic {
-	case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicZfs:
+	case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicZfs, graphdriver.FsMagicEcryptfs:
 		logrus.Errorf("'overlay' is not supported over %s", backingFs)
 		return nil, graphdriver.ErrIncompatibleFS
 	}
diff --git a/docs/userguide/storagedriver/selectadriver.md b/docs/userguide/storagedriver/selectadriver.md
@@ -71,14 +71,14 @@ For example, the `btrfs` storage driver on a Btrfs backing filesystem. The
 following table lists each storage driver and whether it must match the host's
 backing file system:
 
-|Storage driver |Commonly used on |Disabled on                   |
-|---------------|-----------------|------------------------------|
-|`overlay`      |`ext4` `xfs`     |`btrfs` `aufs` `overlay` `zfs`|
-|`aufs`         |`ext4` `xfs`     |`btrfs` `aufs`                |
-|`btrfs`        |`btrfs` _only_   |   N/A                        |
-|`devicemapper` |`direct-lvm`     |   N/A                        |
-|`vfs`          |debugging only   |   N/A                        |
-|`zfs`          |`zfs` _only_     |   N/A                        |
+|Storage driver |Commonly used on |Disabled on                              |
+|---------------|-----------------|-----------------------------------------|
+|`overlay`      |`ext4` `xfs`     |`btrfs` `aufs` `overlay` `zfs` `eCryptfs`|
+|`aufs`         |`ext4` `xfs`     |`btrfs` `aufs` `eCryptfs`                |
+|`btrfs`        |`btrfs` _only_   |   N/A                                   |
+|`devicemapper` |`direct-lvm`     |   N/A                                   |
+|`vfs`          |debugging only   |   N/A                                   |
+|`zfs`          |`zfs` _only_     |   N/A                                   |
 
 
 > **Note**

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func Init(root string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`switch fsMagic {`
`96`		`- case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs:`
	`96`	`+ case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicEcryptfs:`
`97`	`97`	`logrus.Errorf("AUFS is not supported over %s", backingFs)`
`98`	`98`	`return nil, graphdriver.ErrIncompatibleFS`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`switch fsMagic {`
`122`		`- case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicZfs:`
	`122`	`+ case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicZfs, graphdriver.FsMagicEcryptfs:`
`123`	`123`	`logrus.Errorf("'overlay' is not supported over %s", backingFs)`
`124`	`124`	`return nil, graphdriver.ErrIncompatibleFS`
`125`	`125`	`}`