Merge pull request #393 from q384566678/rootfs-check

Ma Shimiao · web-flow · commit 7150e8d99ea8 · 2017-06-15T13:22:42.000+08:00
validate: increase readonly validation
diff --git a/validate/validate.go b/validate/validate.go
@@ -131,8 +131,13 @@ func (v *Validator) CheckRootfsPath() (msgs []string) {
 		msgs = append(msgs, fmt.Sprintf("root.path is %q, but it MUST be a child of %q", v.spec.Root.Path, absBundlePath))
 	}
 
-	return
+	if v.spec.Platform.OS == "windows" {
+		if v.spec.Root.Readonly {
+			msgs = append(msgs, "root.readonly field MUST be omitted or false when platform.os is windows")
+		}
+	}
 
+	return
 }
 
 // CheckSemVer checks v.spec.Version

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,13 @@ func (v *Validator) CheckRootfsPath() (msgs []string) {`
`131`	`131`	`msgs = append(msgs, fmt.Sprintf("root.path is %q, but it MUST be a child of %q", v.spec.Root.Path, absBundlePath))`
`132`	`132`	`}`
`133`	`133`
`134`		`- return`
	`134`	`+ if v.spec.Platform.OS == "windows" {`
	`135`	`+ if v.spec.Root.Readonly {`
	`136`	`+ msgs = append(msgs, "root.readonly field MUST be omitted or false when platform.os is windows")`
	`137`	`+ }`
	`138`	`+ }`
`135`	`139`
	`140`	`+ return`
`136`	`141`	`}`
`137`	`142`
`138`	`143`	`// CheckSemVer checks v.spec.Version`