Making an explicit dependency for nfs-kernel on portmap

svn path=/nixos/trunk/; revision=19090
This commit is contained in:
Lluís Batlle i Rossell 2009-12-24 12:05:34 +00:00
parent 9c465fedfa
commit aaac043ae5

View File

@ -71,6 +71,11 @@ in
config = mkIf config.services.nfsKernel.enable { config = mkIf config.services.nfsKernel.enable {
assertions = singleton
{ assertion = config.services.portmap.enable;
message = "Please enable portmap (services.portmap.enable) to use nfs-kernel.";
};
environment.etc = singleton environment.etc = singleton
{ source = exports; { source = exports;
target = "exports"; target = "exports";
@ -111,7 +116,7 @@ in
description = "Kernel NFS server"; description = "Kernel NFS server";
startOn = "started nfs-kernel-exports"; startOn = "started nfs-kernel-exports and started portmap";
stopOn = "stopping nfs-kernel-exports"; stopOn = "stopping nfs-kernel-exports";
exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}"; exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
@ -122,7 +127,7 @@ in
description = "Kernel NFS server - mount daemon"; description = "Kernel NFS server - mount daemon";
startOn = "started nfs-kernel-nfsd"; startOn = "started nfs-kernel-nfsd and started portmap";
stopOn = "stopping nfs-kernel-exports"; stopOn = "stopping nfs-kernel-exports";
exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}"; exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
@ -133,8 +138,8 @@ in
description = "Kernel NFS server - Network Status Monitor"; description = "Kernel NFS server - Network Status Monitor";
startOn = "started nfs-kernel-nfsd"; startOn = "started nfs-kernel-nfsd and started portmap";
stopOn = "stopping nfs-kernel-exports"; stopOn = "stopping nfs-kernel-exports";
preStart = preStart =
'' ''