Author: eelco
Date: Fri Sep 3 11:39:48 2010
New Revision: 23614
URL: https://svn.nixos.org/websvn/nix/?rev=23614&sc=1
Log:
Modified:
nixos/trunk/modules/system/upstart-events/shutdown.nix
Modified: nixos/trunk/modules/system/upstart-events/shutdown.nix
==============================================================================
--- nixos/trunk/modules/system/upstart-events/shutdown.nix Fri Sep 3
10:46:18 2010 (r23613)
+++ nixos/trunk/modules/system/upstart-events/shutdown.nix Fri Sep 3
11:39:48 2010 (r23614)
@@ -80,7 +80,7 @@
# Unmount file systems. We repeat this until no more file systems
# 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
while test -n "$tryAgain"; do
tryAgain=
@@ -110,7 +110,7 @@
# (For instance, when applied to a bind-mount it
# unmounts the target of the bind-mount.) !!! But
# 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
fi
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
