From 86b42fdfbfe77e6ce7ea30e43585c8cec0b14a50 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Mon, 1 Feb 2010 16:29:15 +0000
Subject: [PATCH] Fix bugs and improve
 modules/services/network-filesystems/openafs-client

svn path=/nixos/trunk/; revision=19751
---
 .../network-filesystems/openafs-client/default.nix     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/modules/services/network-filesystems/openafs-client/default.nix
index 52aaa7d633be..4a888b64bd34 100644
--- a/modules/services/network-filesystems/openafs-client/default.nix
+++ b/modules/services/network-filesystems/openafs-client/default.nix
@@ -16,6 +16,8 @@ let
     cp ${cellServDB} $out/CellServDB
     echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo
   '';
+
+  openafsPkgs = config.boot.kernelPackages.openafsClient;
 in
 {
   ###### interface
@@ -52,7 +54,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [pkgs.openafsClient];
+    environment.systemPackages = [ openafsPkgs ];
 
     environment.etc = [
       { source = afsConfig;
@@ -71,13 +73,13 @@ in
 	preStart = ''
 	  mkdir -m 0755 /afs || true
 	  mkdir -m 0755 -p ${cfg.cacheDirectory} || true
-          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.openafsClient}/lib/openafs/libafs-*.ko || true
-          ${pkgs.openafsClient}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} -dynroot -fakestat
+          ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true
+          ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} -dynroot -fakestat
 	'';
 
 	postStop = ''
 	  umount /afs
-          ${pkgs.openafsClient}/sbin/afsd -shutdown
+          ${openafsPkgs}/sbin/afsd -shutdown
 	  rmmod libafs
 	'';