Browse code
aufs,overlay: disable on eCryptfs
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
unclejack authored on 2016/05/31 18:36:55Showing 4 changed files
- daemon/graphdriver/aufs/aufs.go
- daemon/graphdriver/driver_linux.go
- daemon/graphdriver/overlay/overlay.go
- docs/userguide/storagedriver/selectadriver.md
| ... | ... |
@@ -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 |
} |
| ... | ... |
@@ -16,6 +16,8 @@ const ( |
| 16 | 16 |
FsMagicBtrfs = FsMagic(0x9123683E) |
| 17 | 17 |
// FsMagicCramfs filesystem id for Cramfs |
| 18 | 18 |
FsMagicCramfs = FsMagic(0x28cd3d45) |
| 19 |
+ // FsMagicEcryptfs filesystem id for eCryptfs |
|
| 20 |
+ FsMagicEcryptfs = FsMagic(0xf15f) |
|
| 19 | 21 |
// FsMagicExtfs filesystem id for Extfs |
| 20 | 22 |
FsMagicExtfs = FsMagic(0x0000EF53) |
| 21 | 23 |
// FsMagicF2fs filesystem id for F2fs |
| ... | ... |
@@ -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 |
} |
| ... | ... |
@@ -71,14 +71,14 @@ For example, the `btrfs` storage driver on a Btrfs backing filesystem. The |
| 71 | 71 |
following table lists each storage driver and whether it must match the host's |
| 72 | 72 |
backing file system: |
| 73 | 73 |
|
| 74 |
-|Storage driver |Commonly used on |Disabled on | |
|
| 75 |
-|---------------|-----------------|------------------------------| |
|
| 76 |
-|`overlay` |`ext4` `xfs` |`btrfs` `aufs` `overlay` `zfs`| |
|
| 77 |
-|`aufs` |`ext4` `xfs` |`btrfs` `aufs` | |
|
| 78 |
-|`btrfs` |`btrfs` _only_ | N/A | |
|
| 79 |
-|`devicemapper` |`direct-lvm` | N/A | |
|
| 80 |
-|`vfs` |debugging only | N/A | |
|
| 81 |
-|`zfs` |`zfs` _only_ | N/A | |
|
| 74 |
+|Storage driver |Commonly used on |Disabled on | |
|
| 75 |
+|---------------|-----------------|-----------------------------------------| |
|
| 76 |
+|`overlay` |`ext4` `xfs` |`btrfs` `aufs` `overlay` `zfs` `eCryptfs`| |
|
| 77 |
+|`aufs` |`ext4` `xfs` |`btrfs` `aufs` `eCryptfs` | |
|
| 78 |
+|`btrfs` |`btrfs` _only_ | N/A | |
|
| 79 |
+|`devicemapper` |`direct-lvm` | N/A | |
|
| 80 |
+|`vfs` |debugging only | N/A | |
|
| 81 |
+|`zfs` |`zfs` _only_ | N/A | |
|
| 82 | 82 |
|
| 83 | 83 |
|
| 84 | 84 |
> **Note** |