From 3476a2dfb9474008d37066d758843c4e0c61e513 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 4 Aug 2018 15:50:40 +0200 Subject: pkg/osutil: replace UmountAll with RemoveAll In pkg/ipc we don't just want to UmountAll, we want to remove all handling as many cases as possible (mounts, read-only files, etc, similar to executor's remove_dir). So unmounting and removing needs to be a single function, so that it can handle all these cases. --- pkg/ipc/ipc.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkg/ipc') diff --git a/pkg/ipc/ipc.go b/pkg/ipc/ipc.go index fbaf8962c..4752dc75c 100644 --- a/pkg/ipc/ipc.go +++ b/pkg/ipc/ipc.go @@ -573,8 +573,7 @@ func (c *command) close() { c.cmd.Process.Kill() c.wait() } - osutil.UmountAll(c.dir) - os.RemoveAll(c.dir) + osutil.RemoveAll(c.dir) if c.inrp != nil { c.inrp.Close() } -- cgit mrf-deployment