Merge pull request #741 from floren/fix-mapper

Fixes a problem when using Docker on a host with an encrypted LLVM root.
pull/747/head
shirou 6 years ago committed by GitHub
commit dd49c3f47f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -302,10 +302,9 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
if strings.HasPrefix(d.Device, "/dev/mapper/") { if strings.HasPrefix(d.Device, "/dev/mapper/") {
devpath, err := filepath.EvalSymlinks(d.Device) devpath, err := filepath.EvalSymlinks(d.Device)
if err != nil { if err == nil {
return nil, err d.Device = devpath
} }
d.Device = devpath
} }
// /dev/root is not the real device name // /dev/root is not the real device name

Loading…
Cancel
Save