Merge pull request #5676 from kolyshkin/volume-flags-alt

Fix/improve pkg/storage.InitFSMounts
This commit is contained in:
OpenShift Merge Robot
2020-04-03 18:34:01 +02:00
committed by GitHub
7 changed files with 58 additions and 84 deletions

View File

@ -381,11 +381,9 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
// BIND MOUNTS
configSpec.Mounts = SupercedeUserMounts(userMounts, configSpec.Mounts)
// Process mounts to ensure correct options
finalMounts, err := InitFSMounts(configSpec.Mounts)
if err != nil {
if err := InitFSMounts(configSpec.Mounts); err != nil {
return nil, err
}
configSpec.Mounts = finalMounts
// BLOCK IO
blkio, err := config.CreateBlockIO()