From 7e9ba22dc358196ac0d13524aa05677327f19ff9 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 22 Sep 2014 16:40:20 -0400 Subject: [PATCH] devmapper: `docker info` devices hard coded If `--storage-opt dm.datadev=/dev/loop0 --storage-opt dm.metadatadev=/dev/loop1 ` were provided, the information was not reflected in the information output. Closes: #7137 Signed-off-by: Vincent Batts --- daemon/graphdriver/devmapper/deviceset.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index f973a01363..851fa42ac7 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -1134,8 +1134,16 @@ func (devices *DeviceSet) Status() *Status { status := &Status{} status.PoolName = devices.getPoolName() - status.DataLoopback = path.Join(devices.loopbackDir(), "data") - status.MetadataLoopback = path.Join(devices.loopbackDir(), "metadata") + if len(devices.dataDevice) > 0 { + status.DataLoopback = devices.dataDevice + } else { + status.DataLoopback = path.Join(devices.loopbackDir(), "data") + } + if len(devices.metadataDevice) > 0 { + status.MetadataLoopback = devices.metadataDevice + } else { + status.MetadataLoopback = path.Join(devices.loopbackDir(), "metadata") + } totalSizeInSectors, _, dataUsed, dataTotal, metadataUsed, metadataTotal, err := devices.poolStatus() if err == nil {