From 56fd7d2515a20d124958aa4a825a322a6fee2cd5 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Fri, 23 Jan 2015 14:00:15 -0800 Subject: [PATCH] Blacklist zfs with overlay Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: ec953b0e7ba89ff3b13b3187d9cee0b8c232b4ff Component: engine --- components/engine/daemon/graphdriver/driver.go | 2 ++ components/engine/daemon/graphdriver/overlay/overlay.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/components/engine/daemon/graphdriver/driver.go b/components/engine/daemon/graphdriver/driver.go index c63e1b45db..d89fd6c861 100644 --- a/components/engine/daemon/graphdriver/driver.go +++ b/components/engine/daemon/graphdriver/driver.go @@ -25,6 +25,7 @@ const ( FsMagicReiserFs = FsMagic(0x52654973) FsMagicSmbFs = FsMagic(0x0000517B) FsMagicJffs2Fs = FsMagic(0x000072b6) + FsMagicZfs = FsMagic(0x2fc12fc1) FsMagicUnsupported = FsMagic(0x00000000) ) @@ -58,6 +59,7 @@ var ( FsMagicReiserFs: "reiserfs", FsMagicSmbFs: "smb", FsMagicJffs2Fs: "jffs2", + FsMagicZfs: "zfs", FsMagicUnsupported: "unsupported", } ) diff --git a/components/engine/daemon/graphdriver/overlay/overlay.go b/components/engine/daemon/graphdriver/overlay/overlay.go index 27784c14a3..37162b5caf 100644 --- a/components/engine/daemon/graphdriver/overlay/overlay.go +++ b/components/engine/daemon/graphdriver/overlay/overlay.go @@ -118,6 +118,9 @@ func Init(home string, options []string) (graphdriver.Driver, error) { case graphdriver.FsMagicAufs: log.Error("'overlay' is not supported over aufs.") return nil, graphdriver.ErrIncompatibleFS + case graphdriver.FsMagicZfs: + log.Error("'overlay' is not supported over zfs.") + return nil, graphdriver.ErrIncompatibleFS } // Create the driver home dir