mirror of
https://github.com/NixOS/nix.git
synced 2024-11-25 16:23:02 +00:00
Fix umount failure
Fixes ``` umount: /tmp/nix-shell.i3xRwX/nix-test/local-overlay-store/delete-refs/stores/merged-store/nix/store: filesystem was unmounted, but failed to update userspace mount table. make: *** [mk/lib.mk:93: tests/functional/local-overlay-store/delete-refs.sh.test] Error 16 ``` in a dev shell. Note: this previously worked before we didn't have umount in the dev shell, so we got /run/wrappers/bin/umount.
This commit is contained in:
parent
b0a7edb5ab
commit
9243457cb2
@ -69,7 +69,7 @@ mountOverlayfs () {
|
|||||||
|| skipTest "overlayfs is not supported"
|
|| skipTest "overlayfs is not supported"
|
||||||
|
|
||||||
cleanupOverlay () {
|
cleanupOverlay () {
|
||||||
umount "$storeBRoot/nix/store"
|
umount -n "$storeBRoot/nix/store"
|
||||||
rm -r $storeVolume/workdir
|
rm -r $storeVolume/workdir
|
||||||
}
|
}
|
||||||
trap cleanupOverlay EXIT
|
trap cleanupOverlay EXIT
|
||||||
|
Loading…
Reference in New Issue
Block a user