From 4756ad248a6b8c70a7f4d6cb1aacd6e60e27b1e6 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Fri, 18 Oct 2013 08:30:53 +0000 Subject: [PATCH] devmapper: use major,minor of underlying device in devmapper device name, for readability. --- devmapper/deviceset.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devmapper/deviceset.go b/devmapper/deviceset.go index 75ead65ec..f9526a634 100644 --- a/devmapper/deviceset.go +++ b/devmapper/deviceset.go @@ -376,7 +376,11 @@ func (devices *DeviceSet) initDevmapper() error { sysSt := st.Sys().(*syscall.Stat_t) // "reg-" stands for "regular file". // In the future we might use "dev-" for "device file", etc. - devices.devicePrefix = fmt.Sprintf("docker-reg-%d-%d", sysSt.Dev, sysSt.Ino) + // docker-maj,min[-inode] stands for: + // - Managed by docker + // - The target of this device is at major and minor + // - If is defined, use that file inside the device as a loopback image. Otherwise use the device itself. + devices.devicePrefix = fmt.Sprintf("docker-%d,%d-%d", sysSt.Dev >>8, sysSt.Dev & 0xff, sysSt.Ino) utils.Debugf("Generated prefix: %s", devices.devicePrefix) // Check for the existence of the device -pool