Vendor latest container/storage to fix overlay mountopt

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #1160
Approved by: mheon
This commit is contained in:
Daniel J Walsh
2018-07-25 17:51:31 -04:00
committed by Atomic Bot
parent 73e3945282
commit 9c806a4a3e
4 changed files with 14 additions and 13 deletions

View File

@@ -111,9 +111,9 @@ func MergeTmpfsOptions(options []string) ([]string, error) {
return newOptions, nil
}
// Parse fstab type mount options into mount() flags
// ParseOptions parses fstab type mount options into mount() flags
// and device specific data
func parseOptions(options string) (int, string) {
func ParseOptions(options string) (int, string) {
var (
flag int
data []string
@@ -138,7 +138,7 @@ func parseOptions(options string) (int, string) {
// ParseTmpfsOptions parse fstab type mount options into flags and data
func ParseTmpfsOptions(options string) (int, string, error) {
flags, data := parseOptions(options)
flags, data := ParseOptions(options)
for _, o := range strings.Split(data, ",") {
opt := strings.SplitN(o, "=", 2)
if !validFlags[opt[0]] {