From 82453c84baa44212d5b54d79931fc45c5f89dbc5 Mon Sep 17 00:00:00 2001 From: "Kai Qiang Wu(Kennan)" Date: Tue, 14 Jun 2016 14:01:41 +0000 Subject: [PATCH] Add ecryptfs check for overlay2 We added docs about ecryptfs check but not in code side. Also refactor code to make it clean. Signed-off-by: Kai Qiang Wu(Kennan) (cherry picked from commit 136323b04315eceffbed61d680878ed23cecc015) --- daemon/graphdriver/overlay2/overlay.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index af0a536120..a1343e7b81 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/daemon/graphdriver/overlay2/overlay.go @@ -116,17 +116,8 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap // check if they are running over btrfs, aufs, zfs or overlay switch fsMagic { - case graphdriver.FsMagicBtrfs: - logrus.Error("'overlay' is not supported over btrfs.") - return nil, graphdriver.ErrIncompatibleFS - case graphdriver.FsMagicAufs: - logrus.Error("'overlay' is not supported over aufs.") - return nil, graphdriver.ErrIncompatibleFS - case graphdriver.FsMagicZfs: - logrus.Error("'overlay' is not supported over zfs.") - return nil, graphdriver.ErrIncompatibleFS - case graphdriver.FsMagicOverlay: - logrus.Error("'overlay' is not supported over overlay.") + case graphdriver.FsMagicBtrfs, graphdriver.FsMagicAufs, graphdriver.FsMagicZfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicEcryptfs: + logrus.Errorf("'overlay' is not supported over %s", backingFs) return nil, graphdriver.ErrIncompatibleFS }