diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-23 14:45:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 14:45:28 -0700 |
| commit | 28279ce6bda0e5a5acd06b98f7d8f52c8fc8a393 (patch) | |
| tree | dbfaf3f809b6d237ef903e1da5e89bb3c7d707f6 /vendor | |
| parent | 28d8d72a82bc195f47ef5ec14c33ec61231d9b38 (diff) | |
| parent | 0a0dbc469262ebb38d0496405552fd16dfd5d5d6 (diff) | |
| download | podman-28279ce6bda0e5a5acd06b98f7d8f52c8fc8a393.tar.gz podman-28279ce6bda0e5a5acd06b98f7d8f52c8fc8a393.tar.bz2 podman-28279ce6bda0e5a5acd06b98f7d8f52c8fc8a393.zip | |
Merge pull request #1666 from giuseppe/vendor-storage-overlay
vendor: update container/storage
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/storage/drivers/overlay/overlay.go | 10 |
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) |