daemon:containerStart() fix unhandled error for saveApparmorConfig

thaJeztah · thaJeztah · commit 3a8b05b8b2dc · 2020-01-17T10:36:10.000+01:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
(cherry picked from commit 1250e42a43e5c2dd3efbcbc20c7fa3804c3dc3fb)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: e6ef2b064176a01314e8eb4b2f177450eb23b55c
Component: engine
diff --git a/components/engine/daemon/start.go b/components/engine/daemon/start.go
@@ -161,7 +161,7 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
 		container.HasBeenManuallyStopped = false
 	}
 
-	if daemon.saveApparmorConfig(container); err != nil {
+	if err := daemon.saveApparmorConfig(container); err != nil {
 		return err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func (daemon Daemon) containerStart(container container.Container, checkpoint`
`161`	`161`	`container.HasBeenManuallyStopped = false`
`162`	`162`	`}`
`163`	`163`
`164`		`- if daemon.saveApparmorConfig(container); err != nil {`
	`164`	`+ if err := daemon.saveApparmorConfig(container); err != nil {`
`165`	`165`	`return err`
`166`	`166`	`}`
`167`	`167`