Merge pull request #135 from mrunalp/fix_devices_check

Mrunal Patel · web-flow · commit e05b84720adf · 2016-07-19T15:00:23.000-04:00
runtimetest: Fix check for device nodes
diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go
@@ -283,7 +283,7 @@ func validateDefaultDevices(spec *rspec.Spec) error {
 				return err
 			}
 		} else {
-			if fi.Mode() != os.ModeDevice {
+			if fi.Mode()&os.ModeDevice != os.ModeDevice {
 				return fmt.Errorf("file %v is not a device as expected", device)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ func validateDefaultDevices(spec *rspec.Spec) error {`
`283`	`283`	`return err`
`284`	`284`	`}`
`285`	`285`	`} else {`
`286`		`- if fi.Mode() != os.ModeDevice {`
	`286`	`+ if fi.Mode()&os.ModeDevice != os.ModeDevice {`
`287`	`287`	`return fmt.Errorf("file %v is not a device as expected", device)`
`288`	`288`	`}`
`289`	`289`	`}`