summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-10-18 09:18:14 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-10-23 23:09:35 +0200
commit0a0dbc469262ebb38d0496405552fd16dfd5d5d6 (patch)
treef4e4f7ccfc5e8e2fb68ae47627612758db758357 /vendor/github.com
parent10bab99ea01006c4ca0048e6177d753f0732add7 (diff)
downloadpodman-0a0dbc469262ebb38d0496405552fd16dfd5d5d6.tar.gz
podman-0a0dbc469262ebb38d0496405552fd16dfd5d5d6.tar.bz2
podman-0a0dbc469262ebb38d0496405552fd16dfd5d5d6.zip
vendor: update containers/storage
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/containers/storage/drivers/overlay/overlay.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/vendor/github.com/containers/storage/drivers/overlay/overlay.go b/vendor/github.com/containers/storage/drivers/overlay/overlay.go
index 66ccc6a63..2e0498f51 100644
--- a/vendor/github.com/containers/storage/drivers/overlay/overlay.go
+++ b/vendor/github.com/containers/storage/drivers/overlay/overlay.go
@@ -138,10 +138,12 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
}
// check if they are running over btrfs, aufs, zfs, overlay, or ecryptfs
- switch fsMagic {
- case graphdriver.FsMagicAufs, graphdriver.FsMagicZfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicEcryptfs:
- logrus.Errorf("'overlay' is not supported over %s", backingFs)
- return nil, errors.Wrapf(graphdriver.ErrIncompatibleFS, "'overlay' is not supported over %s", backingFs)
+ if opts.mountProgram == "" {
+ switch fsMagic {
+ case graphdriver.FsMagicAufs, graphdriver.FsMagicZfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicEcryptfs:
+ logrus.Errorf("'overlay' is not supported over %s", backingFs)
+ return nil, errors.Wrapf(graphdriver.ErrIncompatibleFS, "'overlay' is not supported over %s", backingFs)
+ }
}
rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)