From b86e8208d58b503b901b27b7836cb13742a6f6a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Oct 2009 08:49:35 +0000
Subject: [PATCH] * Doh!  The mount options weren't passed properly.

svn path=/nixos/trunk/; revision=18047
---
 modules/tasks/filesystems.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index d6ec640ac38..8225a618325 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -21,7 +21,7 @@ let
         newDevices=
 
         ${flip concatMapStrings fileSystems (fs: ''
-          for theContinueKeyword in theFollowingCode; do
+          for dummy in x; do # make `continue' work
             mountPoint='${fs.mountPoint}'
             device='${if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}"}'
             fsType='${fs.fsType}'
@@ -94,7 +94,7 @@ let
               ''
             }
 
-            if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
+            if ${mount}/bin/mount -t "$fsType" -o "${fs.options}" "$device" "$mountPoint"; then
                 newDevices=1
             fi
           done