github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup cleanup code

Browse Source 
Only remove main mount at rootfs, as we do not really know
about the state of the rest.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-08-22 17:26:16 +01:00
parent 49cf74f4f6
commit 5773dfd844
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/init/cmd/service/prepare.go
View File

@ -266,27 +266,7 @@ func prepareProcess(pid int, runtime Runtime) error {
// cleanup functions are best efforts only, mainly for rw onboot containers // cleanup functions are best efforts only, mainly for rw onboot containers
func cleanup(path string) { func cleanup(path string) {
// see if we are dealing with a read only or read write container // remove the root mount
if _, err := os.Stat(filepath.Join(path, "lower")); err != nil {
cleanupRO(path)
} else {
cleanupRW(path)
}
}
func cleanupRO(path string) {
// remove the bind mount
rootfs := filepath.Join(path, "rootfs") rootfs := filepath.Join(path, "rootfs")
_ = unix.Unmount(rootfs, 0) _ = unix.Unmount(rootfs, 0)
} }
func cleanupRW(path string) {
// remove the overlay mount
rootfs := filepath.Join(path, "rootfs")
_ = os.RemoveAll(rootfs)
_ = unix.Unmount(rootfs, 0)
// remove the tmpfs
tmp := filepath.Join(path, "tmp")
_ = os.RemoveAll(tmp)
_ = unix.Unmount(tmp, 0)
}