docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17757 from rhvgoyal/log-blkid-failure 

devmapper: Provide more error information if blkid fails
This commit is contained in:
Vincent Batts 2015-11-07 09:16:14 -05:00
parent e71cbc337f 2c8b7c597a
commit 10df5647bd
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/graphdriver/devmapper/deviceset.go
View File

@ -826,8 +826,7 @@ func (devices *DeviceSet) loadMetadata(hash string) *devInfo {
func getDeviceUUID(device string) (string, error) { func getDeviceUUID(device string) (string, error) {
out, err := exec.Command("blkid", "-s", "UUID", "-o", "value", device).Output() out, err := exec.Command("blkid", "-s", "UUID", "-o", "value", device).Output()
if err != nil { if err != nil {
logrus.Debugf("Failed to find uuid for device %s:%v", device, err) return "", fmt.Errorf("Failed to find uuid for device %s:%v", device, err)
return "", err
} }
uuid := strings.TrimSuffix(string(out), "\n") uuid := strings.TrimSuffix(string(out), "\n")