From f1a6a8b6e0b701ca3881c1a8ac49038e921a8852 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Sep 2010 11:39:48 +0000 Subject: [PATCH] svn path=/nixos/trunk/; revision=23614 --- modules/system/upstart-events/shutdown.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix index b7a004724be..51b741d54e0 100644 --- a/modules/system/upstart-events/shutdown.nix +++ b/modules/system/upstart-events/shutdown.nix @@ -80,7 +80,7 @@ with pkgs.lib; # 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 @@ with pkgs.lib; # (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