diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-07-16 14:51:49 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-07-16 14:51:49 +0000 |
| commit | 6119c399d864739674d2568abd943a41ca09788c (patch) | |
| tree | 0ceb6cc6d3da3b34f98ac62003ef33019ffdb77e /modules/services/misc/nix-daemon.nix | |
| parent | 7cb4503ad63e5376abad54d3479649a232df3ef2 (diff) | |
| download | nixpkgs-6119c399d864739674d2568abd943a41ca09788c.tar nixpkgs-6119c399d864739674d2568abd943a41ca09788c.tar.gz nixpkgs-6119c399d864739674d2568abd943a41ca09788c.tar.bz2 nixpkgs-6119c399d864739674d2568abd943a41ca09788c.tar.lz nixpkgs-6119c399d864739674d2568abd943a41ca09788c.tar.xz nixpkgs-6119c399d864739674d2568abd943a41ca09788c.tar.zst nixpkgs-6119c399d864739674d2568abd943a41ca09788c.zip | |
* Support tasks in the new Upstart formalism.
* Swap task: fixed removing disabled swap devices. * Swap task: specified the type of swapDevices. svn path=/nixos/branches/modular-nixos/; revision=16396
Diffstat (limited to 'modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | modules/services/misc/nix-daemon.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix index ee8d67f7471..b8911a8cea3 100644 --- a/modules/services/misc/nix-daemon.nix +++ b/modules/services/misc/nix-daemon.nix @@ -236,21 +236,18 @@ in target = "nix.machines"; }; - services.extraJobs = [ + jobs = pkgs.lib.singleton { name = "nix-daemon"; - job = '' - start on startup - stop on shutdown - respawn - script + startOn = "startup"; + + script = + '' export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH ${config.nix.envVars} exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1 - end script - ''; - } - ]; + ''; + }; environment.shellInit = '' |