Merge pull request #7840 from hinshun/feature/mount-subdirectory

Use mount.Target to specify subdirectory of rootfs mount
This commit is contained in:
Derek McGowan
2023-01-30 21:35:34 -08:00
committed by GitHub
26 changed files with 282 additions and 65 deletions

View File

@@ -307,7 +307,7 @@ func (p *Init) delete(ctx context.Context) error {
}
p.io.Close()
}
if err2 := mount.UnmountAll(p.Rootfs, 0); err2 != nil {
if err2 := mount.UnmountRecursive(p.Rootfs, 0); err2 != nil {
log.G(ctx).WithError(err2).Warn("failed to cleanup rootfs mount")
if err == nil {
err = fmt.Errorf("failed rootfs umount: %w", err2)