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 | |
| 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
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/storage/drivers/overlay/overlay.go | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/vendor.conf b/vendor.conf index 8004f9056..dfcdbbe80 100644 --- a/vendor.conf +++ b/vendor.conf @@ -12,7 +12,7 @@ github.com/containerd/continuity master github.com/containernetworking/cni v0.7.0-alpha1 github.com/containernetworking/plugins 1562a1e60ed101aacc5e08ed9dbeba8e9f3d4ec1 github.com/containers/image bd10b1b53b2976f215b3f2f848fb8e7cad779aeb -github.com/containers/storage 24f0de45708bc6e4c8062828cd03812aaebc30db https://github.com/rhatdan/storage +github.com/containers/storage bd5818eda84012cf1db4dafbddd4b7509bb77142 github.com/containers/psgo 5dde6da0bc8831b35243a847625bcf18183bd1ee github.com/coreos/go-systemd v14 github.com/cri-o/ocicni 2d2983e40c242322a56c22a903785e7f83eb378c 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) |