public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove `stopOn = "shutdown"' which doesn't work.

Browse Source 
svn path=/nixos/trunk/; revision=22101
This commit is contained in:
Eelco Dolstra 2010-06-02 16:05:09 +00:00
parent 8519e72ccc
commit d317d83ba8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/programs/blcr.nix
View File

@ -22,7 +22,7 @@ in
environment.blcr.enable = mkOption { environment.blcr.enable = mkOption {
default = false; default = false;
description = description =
"Wheter to enable support for the BLCR checkpoingint tool."; "Wheter to enable support for the BLCR checkpointing tool.";
}; };
environment.blcr.autorun = mkOption { environment.blcr.autorun = mkOption {
@ -44,7 +44,6 @@ in
task = true; task = true;
startOn = if cfg.autorun then "started udev" else null; startOn = if cfg.autorun then "started udev" else null;
stopOn = "shutdown";
preStart = '' preStart = ''
${insmod} ${blcr_imports_ko} ${insmod} ${blcr_imports_ko}

3
modules/services/monitoring/monit.nix
View File

@ -27,6 +27,7 @@ in
}; };
config = mkIf config.services.monit.enable { config = mkIf config.services.monit.enable {
environment.etc = [ environment.etc = [
{ {
source = pkgs.writeTextFile { source = pkgs.writeTextFile {
@ -37,11 +38,11 @@ in
mode = "0400"; mode = "0400";
} }
]; ];
jobs.monit = { jobs.monit = {
description = "Monit system watcher"; description = "Monit system watcher";
startOn = config.services.monit.startOn; startOn = config.services.monit.startOn;
stopOn = "shutdown";
exec = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf"; exec = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";