merge branch 'pr-1217'

cyphar · cyphar · commit cae7979d1fda · 2016-12-24T09:31:38.000+11:00
Closes #1217 LGTMs: @cyphar @hqhq
diff --git a/libcontainer/devices/devices_unix.go b/libcontainer/devices/devices_unix.go
@@ -94,6 +94,9 @@ func getDevices(path string) ([]*configs.Device, error) {
 			if err == ErrNotADevice {
 				continue
 			}
+			if os.IsNotExist(err) {
+				continue
+			}
 			return nil, err
 		}
 		out = append(out, device)

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ func getDevices(path string) ([]*configs.Device, error) {`
`94`	`94`	`if err == ErrNotADevice {`
`95`	`95`	`continue`
`96`	`96`	`}`
	`97`	`+ if os.IsNotExist(err) {`
	`98`	`+ continue`
	`99`	`+ }`
`97`	`100`	`return nil, err`
`98`	`101`	`}`
`99`	`102`	`out = append(out, device)`