Merge pull request #1327 from CarltonSemple/lxd-fix

Update devices_unix.go for LXD
opencontainers · Mar 9, 2017 · df4d872 · df4d872
2 parents 4815f67 + 0590736
commit df4d872
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libcontainer/devices/devices_unix.go b/libcontainer/devices/devices_unix.go
@@ -75,7 +75,8 @@ func getDevices(path string) ([]*configs.Device, error) {
 		switch {
 		case f.IsDir():
 			switch f.Name() {
-			case "pts", "shm", "fd", "mqueue":
+			// ".lxc" & ".lxd-mounts" added to address https://github.com/lxc/lxd/issues/2825
+			case "pts", "shm", "fd", "mqueue", ".lxc", ".lxd-mounts":
 				continue
 			default:
 				sub, err := getDevices(filepath.Join(path, f.Name()))