Browse code

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 <vbatts@redhat.com>

Vincent Batts authored on 2014/09/23 05:40:20
Showing 1 changed files
... ...
@@ -1134,8 +1134,16 @@ func (devices *DeviceSet) Status() *Status {
1134 1134
 	status := &Status{}
1135 1135
 
1136 1136
 	status.PoolName = devices.getPoolName()
1137
-	status.DataLoopback = path.Join(devices.loopbackDir(), "data")
1138
-	status.MetadataLoopback = path.Join(devices.loopbackDir(), "metadata")
1137
+	if len(devices.dataDevice) > 0 {
1138
+		status.DataLoopback = devices.dataDevice
1139
+	} else {
1140
+		status.DataLoopback = path.Join(devices.loopbackDir(), "data")
1141
+	}
1142
+	if len(devices.metadataDevice) > 0 {
1143
+		status.MetadataLoopback = devices.metadataDevice
1144
+	} else {
1145
+		status.MetadataLoopback = path.Join(devices.loopbackDir(), "metadata")
1146
+	}
1139 1147
 
1140 1148
 	totalSizeInSectors, _, dataUsed, dataTotal, metadataUsed, metadataTotal, err := devices.poolStatus()
1141 1149
 	if err == nil {