Author: eelco
Date: Fri Mar 16 13:40:02 2012
New Revision: 33156
URL: https://nixos.org/websvn/nix/?rev=33156&sc=1
Log:
* In fact get rid of the whole nfs-kernel-exports job.
Modified:
nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix
Modified: nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix
==============================================================================
--- nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Fri Mar
16 13:28:35 2012 (r33155)
+++ nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Fri Mar
16 13:40:02 2012 (r33156)
@@ -114,29 +114,12 @@
jobs =
optionalAttrs cfg.server.enable
- { nfs_kernel_exports =
- { name = "nfs-kernel-exports";
-
- description = "Kernel NFS server";
-
- startOn = "started network-interfaces and started portmap and
filesystem";
-
- postStart =
- ''
- # exports file is ${exports}
- # keep this comment so that this job is restarted whenever
exports changes!
- ${pkgs.nfsUtils}/sbin/exportfs -ra
- '';
- };
- }
-
- // optionalAttrs cfg.server.enable
{ nfs_kernel_nfsd =
{ name = "nfs-kernel-nfsd";
description = "Kernel NFS server";
- startOn = "starting nfs-kernel-exports or started portmap";
+ startOn = "started portmap";
stopOn = "stopped nfs-kernel-statd or stopping portmap";
preStart =
@@ -147,6 +130,10 @@
# Create a state directory required by NFSv4.
mkdir -p /var/lib/nfs/v4recovery
+ # exports file is ${exports}
+ # keep this comment so that this job is restarted whenever
exports changes!
+ ${pkgs.nfsUtils}/sbin/exportfs -ra
+
# rpc.nfsd needs the kernel support
${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
@@ -197,7 +184,7 @@
"started nfs-kernel-mountd and started nfs-kernel-nfsd"
else
"started portmap";
- stopOn = "stopping nfs-kernel-exports or stopping portmap";
+ stopOn = "stopping nfs-kernel-nfsd or stopping portmap";
preStart =
''
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
