diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-08-04 15:50:40 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-08-04 15:50:40 +0200 |
| commit | 3476a2dfb9474008d37066d758843c4e0c61e513 (patch) | |
| tree | 8b1a343589ffca3074e5116590eaa3e4f3d7c3f7 /pkg/ipc | |
| parent | df7f6947ba33144e6f1845faf37f62194d3f3c36 (diff) | |
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.
Diffstat (limited to 'pkg/ipc')
| -rw-r--r-- | pkg/ipc/ipc.go | 3 |
1 files changed, 1 insertions, 2 deletions
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() } |
