diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-26 17:04:07 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-26 17:04:07 +0200 |
| commit | b7b2476499fac4ccc63057adfa484df6184ea18d (patch) | |
| tree | fbb64312fb429dc83412e8f890ac43f870cc5e2a /modules/services/networking/rpcbind.nix | |
| parent | f70fbb179128e795fcc6d07c52454c1dbcaa196a (diff) | |
| download | nixpkgs-b7b2476499fac4ccc63057adfa484df6184ea18d.tar nixpkgs-b7b2476499fac4ccc63057adfa484df6184ea18d.tar.gz nixpkgs-b7b2476499fac4ccc63057adfa484df6184ea18d.tar.bz2 nixpkgs-b7b2476499fac4ccc63057adfa484df6184ea18d.tar.lz nixpkgs-b7b2476499fac4ccc63057adfa484df6184ea18d.tar.xz nixpkgs-b7b2476499fac4ccc63057adfa484df6184ea18d.tar.zst nixpkgs-b7b2476499fac4ccc63057adfa484df6184ea18d.zip | |
Remove the portmap module
It's obsoleted by rpcbind.
Diffstat (limited to 'modules/services/networking/rpcbind.nix')
| -rw-r--r-- | modules/services/networking/rpcbind.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/modules/services/networking/rpcbind.nix b/modules/services/networking/rpcbind.nix index 7180b2cfa14..00c958c5a4a 100644 --- a/modules/services/networking/rpcbind.nix +++ b/modules/services/networking/rpcbind.nix @@ -29,9 +29,6 @@ let ''; }; - check = mkAssert (!(config.services.rpcbind.enable && config.services.portmap.enable)) - "Portmap and rpcbind cannot both be enabled."; - in { @@ -59,7 +56,7 @@ in ###### implementation - config = mkIf config.services.rpcbind.enable (check { + config = mkIf config.services.rpcbind.enable { environment.systemPackages = [ pkgs.rpcbind ]; @@ -79,6 +76,6 @@ in serviceConfig.ExecStart = "@${pkgs.rpcbind}/bin/rpcbind rpcbind"; }; - }); + }; } |