diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-22 04:12:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 04:12:57 +0100 |
| commit | ec969875fa13e90f4ce696e9d24b86a02f79f54a (patch) | |
| tree | 8255885680873846e27b5f55b29c37cfc9e19adc | |
| parent | b56a52ee5a6de641f8d30b732410027510958526 (diff) | |
| parent | 4563bf42b8d2ee1ed6748e691bd9a93efb7d1363 (diff) | |
| download | podman-ec969875fa13e90f4ce696e9d24b86a02f79f54a.tar.gz podman-ec969875fa13e90f4ce696e9d24b86a02f79f54a.tar.bz2 podman-ec969875fa13e90f4ce696e9d24b86a02f79f54a.zip | |
Merge pull request #2202 from rhatdan/storage
Vendor in latest containers/storage
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/storage/drivers/overlay/overlay.go | 20 | ||||
| -rw-r--r-- | vendor/github.com/containers/storage/vendor.conf | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/vendor.conf b/vendor.conf index fe7adf6c9..76c2b8810 100644 --- a/vendor.conf +++ b/vendor.conf @@ -16,7 +16,7 @@ github.com/containerd/continuity 004b46473808b3e7a4a3049c20e4376c91eb966d github.com/containernetworking/cni v0.7.0-alpha1 github.com/containernetworking/plugins v0.7.4 github.com/containers/image v1.3 -github.com/containers/storage v1.7 +github.com/containers/storage v1.8 github.com/containers/psgo v1.1 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 3e8daf23c..57d6dd63a 100644 --- a/vendor/github.com/containers/storage/drivers/overlay/overlay.go +++ b/vendor/github.com/containers/storage/drivers/overlay/overlay.go @@ -158,6 +158,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap return nil, err } + var usingMetacopy bool var supportsDType bool if opts.mountProgram != "" { supportsDType = true @@ -172,18 +173,17 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap } return nil, errors.Wrap(err, "kernel does not support overlay fs") } - } - - usingMetacopy, err := doesMetacopy(home, opts.mountOptions) - if err == nil { - if usingMetacopy { - logrus.Debugf("overlay test mount indicated that metacopy is being used") + usingMetacopy, err = doesMetacopy(home, opts.mountOptions) + if err == nil { + if usingMetacopy { + logrus.Debugf("overlay test mount indicated that metacopy is being used") + } else { + logrus.Debugf("overlay test mount indicated that metacopy is not being used") + } } else { - logrus.Debugf("overlay test mount indicated that metacopy is not being used") + logrus.Warnf("overlay test mount did not indicate whether or not metacopy is being used: %v", err) + return nil, err } - } else { - logrus.Warnf("overlay test mount did not indicate whether or not metacopy is being used: %v", err) - return nil, err } if !opts.skipMountHome { diff --git a/vendor/github.com/containers/storage/vendor.conf b/vendor/github.com/containers/storage/vendor.conf index 936321b12..04af9010b 100644 --- a/vendor/github.com/containers/storage/vendor.conf +++ b/vendor/github.com/containers/storage/vendor.conf @@ -8,7 +8,7 @@ github.com/mattn/go-shellwords 753a2322a99f87c0eff284980e77f53041555bc6 github.com/mistifyio/go-zfs c0224de804d438efd11ea6e52ada8014537d6062 github.com/opencontainers/go-digest master github.com/opencontainers/runc 6c22e77604689db8725fa866f0f2ec0b3e8c3a07 -github.com/opencontainers/selinux 36a9bc45a08c85f2c52bd9eb32e20267876773bd +github.com/opencontainers/selinux v1.1 github.com/ostreedev/ostree-go master github.com/pborman/uuid 1b00554d822231195d1babd97ff4a781231955c9 github.com/pkg/errors master |