Author: eelco
Date: Fri Mar 16 13:56:51 2012
New Revision: 33159
URL: https://nixos.org/websvn/nix/?rev=33159&sc=1
Log:
* Drop the unnecessary "nfs-kernel-" prefix from the job names.
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:55:10 2012 (r33158)
+++ nixos/trunk/modules/services/network-filesystems/nfs-kernel.nix Fri Mar
16 13:56:51 2012 (r33159)
@@ -20,18 +20,6 @@
rpc.mountd, rpc.nfsd
rpc.statd, rpc.lockd (if necessary), and
rpc.rquotad"
-
- I tried to mimic that with upstart, playing with
stopping/stopped/started/starting
- events.
-
- I consider two scenarios:
- - Starting at boot. Then, portmap will emit a started event.
- - "restart nfs-kernel-exports". Then, portmap will not emit anything. Due
- to the comment in postStart, this will happen on nixos-rebuild if
- the exportfs file changed.
-
- From these scenarios, I came up with the startOn and stopOn at the time of
commiting
- this comment.
*/
@@ -102,7 +90,7 @@
config =
mkAssert
(cfg.client.enable || cfg.server.enable -> config.services.portmap.enable)
"
- Please enable portmap (services.portmap.enable) to use nfs-kernel.
+ Please enable portmap (services.portmap.enable) to use nfsd.
" {
services.portmap.enable = mkAlways (cfg.client.enable ||
cfg.server.enable);
@@ -114,13 +102,11 @@
jobs =
optionalAttrs cfg.server.enable
- { nfs_kernel_nfsd =
- { name = "nfs-kernel-nfsd";
-
- description = "Kernel NFS server";
+ { nfsd =
+ { description = "Kernel NFS server";
startOn = "started portmap";
- stopOn = "stopped nfs-kernel-statd or stopping portmap";
+ stopOn = "stopped statd or stopping portmap";
preStart =
''
@@ -160,13 +146,11 @@
}
// optionalAttrs cfg.server.enable
- { nfs_kernel_mountd =
- { name = "nfs-kernel-mountd";
-
- description = "Kernel NFS server - mount daemon";
+ { mountd =
+ { description = "Kernel NFS server - mount daemon";
- startOn = "started nfs-kernel-nfsd";
- stopOn = "stopped nfs-kernel-statd";
+ startOn = "started nfsd";
+ stopOn = "stopped statd";
daemonType = "fork";
@@ -175,16 +159,14 @@
}
// optionalAttrs (cfg.client.enable || cfg.server.enable)
- { nfs_kernel_statd =
- { name = "nfs-kernel-statd";
-
- description = "Kernel NFS server - Network Status Monitor";
+ { statd =
+ { description = "Kernel NFS server - Network Status Monitor";
startOn = if cfg.server.enable then
- "started nfs-kernel-mountd and started nfs-kernel-nfsd"
+ "started mountd and started nfsd"
else
"started portmap";
- stopOn = "stopping nfs-kernel-nfsd or stopping portmap";
+ stopOn = "stopping nfsd or stopping portmap";
preStart =
''
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
