Merge pull request #360 from thaJeztah/19.03_backport_fix_missing_dir_cleanup_file

thaJeztah · web-flow · commit 60135e683b3c · 2019-09-18T13:55:38.000+02:00
[19.03 backport] Ensure parent dir exists for mount cleanup file
Upstream-commit: 6de2bd28dfc2e0b5482fa688d181d8ac7c7e60bf
Component: engine
diff --git a/components/engine/daemon/daemon_unix.go b/components/engine/daemon/daemon_unix.go
@@ -1265,6 +1265,10 @@ func setupDaemonRootPropagation(cfg *config.Config) error {
 		return nil
 	}
 
+	if err := os.MkdirAll(filepath.Dir(cleanupFile), 0700); err != nil {
+		return errors.Wrap(err, "error creating dir to store mount cleanup file")
+	}
+
 	if err := ioutil.WriteFile(cleanupFile, nil, 0600); err != nil {
 		return errors.Wrap(err, "error writing file to signal mount cleanup on shutdown")
 	}

Original file line number	Diff line number	Diff line change
`@@ -1265,6 +1265,10 @@ func setupDaemonRootPropagation(cfg *config.Config) error {`
`1265`	`1265`	`return nil`
`1266`	`1266`	`}`
`1267`	`1267`
	`1268`	`+ if err := os.MkdirAll(filepath.Dir(cleanupFile), 0700); err != nil {`
	`1269`	`+ return errors.Wrap(err, "error creating dir to store mount cleanup file")`
	`1270`	`+ }`
	`1271`	`+`
`1268`	`1272`	`if err := ioutil.WriteFile(cleanupFile, nil, 0600); err != nil {`
`1269`	`1273`	`return errors.Wrap(err, "error writing file to signal mount cleanup on shutdown")`
`1270`	`1274`	`}`