From 5ddaf9b963cfe0819788846c6d90d514a93e09ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jun 2010 16:14:41 +0000
Subject: [PATCH] * Set `services.nfsKernel.client.enable' automatically if
 there is a   filesystem with type "nfs" or "nfs4".

svn path=/nixos/branches/boot-order/; revision=22189
---
 modules/services/network-filesystems/nfs-kernel.nix | 2 +-
 tests/nfs.nix                                       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 1baa0305183..2a9f78e7d2f 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -21,7 +21,7 @@ in
     services.nfsKernel = {
 
       client.enable = mkOption {
-        default = false;
+        default = any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") config.fileSystems;
         description = ''
           Whether to enable the kernel's NFS client daemons.
         '';
diff --git a/tests/nfs.nix b/tests/nfs.nix
index b0739ab92ab..91a1005da94 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -5,8 +5,7 @@
   nodes =
     { client = 
         { config, pkgs, ... }:
-        { services.nfsKernel.client.enable = true;
-          fileSystems = pkgs.lib.mkOverride 50 {} 
+        { fileSystems = pkgs.lib.mkOverride 50 {} 
             [ { mountPoint = "/data";
                 device = "server:/data";
                 fsType = "nfs";