Vendor after merging c/image#536

... which adds blob info caching

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2018-08-25 11:02:56 +02:00
parent bfc0c5e531
commit bcf3dbbb93
80 changed files with 7103 additions and 262 deletions

View File

@@ -2401,7 +2401,7 @@ func (devices *DeviceSet) MountDevice(hash, path string, moptions graphdriver.Mo
addNouuid := strings.Contains("nouuid", mountOptions)
mountOptions = strings.Join(moptions.Options, ",")
if addNouuid {
mountOptions = fmt.Sprintf("nouuid,", mountOptions)
mountOptions = fmt.Sprintf("nouuid,%s", mountOptions)
}
}