svn path=/nixos/trunk/; revision=23614
This commit is contained in:
parent
d550cc6d63
commit
f1a6a8b6e0
|
@ -80,7 +80,7 @@ with pkgs.lib;
|
||||||
|
|
||||||
# Unmount file systems. We repeat this until no more file systems
|
# Unmount file systems. We repeat this until no more file systems
|
||||||
# can be unmounted. This is to handle loopback devices, file
|
# can be unmounted. This is to handle loopback devices, file
|
||||||
# systems mounted on other file systems and so on.
|
# systems mounted on other file systems and so on.
|
||||||
tryAgain=1
|
tryAgain=1
|
||||||
while test -n "$tryAgain"; do
|
while test -n "$tryAgain"; do
|
||||||
tryAgain=
|
tryAgain=
|
||||||
|
@ -110,7 +110,7 @@ with pkgs.lib;
|
||||||
# (For instance, when applied to a bind-mount it
|
# (For instance, when applied to a bind-mount it
|
||||||
# unmounts the target of the bind-mount.) !!! But
|
# unmounts the target of the bind-mount.) !!! But
|
||||||
# we should use `-f' for NFS.
|
# we should use `-f' for NFS.
|
||||||
if [ "$mp" != / -a "$mp" != /nix/store ]; then
|
if [ "$mp" != / -a "$mp" != /nix -a "$mp" != /nix/store ]; then
|
||||||
if umount -n "$mp"; then success=1; tryAgain=1; fi
|
if umount -n "$mp"; then success=1; tryAgain=1; fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue