Merge pull request #3460 from brauner/2017-06-28/check_whether_disk_d…

…evice_exists_in_container_devices container_lxc: check whether disk device exists
canonical · Jun 27, 2017 · ccf78e1 · ccf78e1
2 parents ceaabb6 + 1ff8664
commit ccf78e1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
@@ -6299,6 +6299,11 @@ func (c *containerLXC) removeDiskDevice(name string, m types.Device) error {
 	devName := fmt.Sprintf("disk.%s", strings.Replace(tgtPath, "/", "-", -1))
 	devPath := filepath.Join(c.DevicesPath(), devName)
 
+	// The dsk device doesn't exist and cannot be mounted.
+	if !shared.PathExists(devPath) {
+		return nil
+	}
+
 	// Remove the bind-mount from the container
 	if c.FileExists(tgtPath) == nil {
 		err := c.removeMount(m["path"])