vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

FIX 6613:launch docker fail with space named drive

Browse source 
Signed-off-by: Guillaume Dufour <guillaume.duff@gmail.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
This commit is contained in:
Guillaume Dufour 2014-09-15 11:04:05 +02:00 • committed by Tibor Vass
parent 3a8f8e206f
commit e7af2e5d92
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mount/mountinfo_linux.go
View file

@ -61,12 +61,13 @@ func parseInfoFile(r io.Reader) ([]*MountInfo, error) {
// Safe as mountinfo encodes mountpoints with spaces as \040.
index := strings.Index(text, " - ")
postSeparatorFields := strings.Fields(text[index+3:])
if len(postSeparatorFields) != 3 {
return nil, fmt.Errorf("Error did not find 3 fields post '-' in '%s'", text)
if len(postSeparatorFields) < 3 {
return nil, fmt.Errorf("Error found less than 3 fields post '-' in %q", text)
}
p.Fstype = postSeparatorFields[0]
p.Source = postSeparatorFields[1]
p.VfsOpts = postSeparatorFields[2]
p.VfsOpts = strings.Join(postSeparatorFields[2:], " ")
out = append(out, p)
}
return out, nil