agent: support agent as init process in rootfs images

Julio Montes · Julio Montes · commit 54f77cfcf429 · 2018-09-20T09:03:48.000-05:00
Don't fail if `dev` is already mounted. fixes kata-containers#264 Signed-off-by: Julio Montes <julio.montes@intel.com>
diff --git a/agent.go b/agent.go
@@ -847,7 +847,11 @@ func mountToRootfs(m initMount) error {
 func generalMount() error {
 	for _, m := range initRootfsMounts {
 		if err := mountToRootfs(m); err != nil {
-			return err
+			// dev is already mounted if the rootfs image is used
+			if m.src != "dev" {
+				return err
+			}
+			agentLog.WithError(err).WithField("src", m.src).Warnf("Could not mount filesystem")
 		}
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,11 @@ func mountToRootfs(m initMount) error {`
`847`	`847`	`func generalMount() error {`
`848`	`848`	`for _, m := range initRootfsMounts {`
`849`	`849`	`if err := mountToRootfs(m); err != nil {`
`850`		`- return err`
	`850`	`+ // dev is already mounted if the rootfs image is used`
	`851`	`+ if m.src != "dev" {`
	`852`	`+ return err`
	`853`	`+ }`
	`854`	`+ agentLog.WithError(err).WithField("src", m.src).Warnf("Could not mount filesystem")`
`851`	`855`	`}`
`852`	`856`	`}`
`853`	`857`	`return nil`