diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-23 09:22:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 09:22:12 -0700 |
| commit | 8ff974248084f752d328d7a8d1cd6af2959bc3fd (patch) | |
| tree | 06e527e0f1c8b1736d6af2c1bb53d2e856099872 /libpod/options.go | |
| parent | c019830a750d3c2cdb20d2568c9e0f9fdc35165e (diff) | |
| parent | a95d71f1135165ae51c28b49275e5a3948fbbd2b (diff) | |
| download | podman-8ff974248084f752d328d7a8d1cd6af2959bc3fd.tar.gz podman-8ff974248084f752d328d7a8d1cd6af2959bc3fd.tar.bz2 podman-8ff974248084f752d328d7a8d1cd6af2959bc3fd.zip | |
Merge pull request #1687 from rhatdan/vendor
Move selinux label reservations to containers storage.
Diffstat (limited to 'libpod/options.go')
| -rw-r--r-- | libpod/options.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libpod/options.go b/libpod/options.go index 228b38ba5..8d044313b 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -391,11 +391,7 @@ func WithSecLabels(labelOpts []string) CtrCreateOption { if ctr.valid { return ErrCtrFinalized } - var err error - ctr.config.ProcessLabel, ctr.config.MountLabel, err = ctr.runtime.initLabels(labelOpts) - if err != nil { - return errors.Wrapf(err, "failed to init labels") - } + ctr.config.LabelOpts = labelOpts return nil } } |