From d317d83ba8e548eb32f83fe6ae974604b632e904 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Jun 2010 16:05:09 +0000 Subject: [PATCH] * Remove `stopOn = "shutdown"' which doesn't work. svn path=/nixos/trunk/; revision=22101 --- modules/programs/blcr.nix | 3 +-- modules/services/monitoring/monit.nix | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix index b2b7aee4ab6..b6407ee603b 100644 --- a/modules/programs/blcr.nix +++ b/modules/programs/blcr.nix @@ -22,7 +22,7 @@ in environment.blcr.enable = mkOption { default = false; description = - "Wheter to enable support for the BLCR checkpoingint tool."; + "Wheter to enable support for the BLCR checkpointing tool."; }; environment.blcr.autorun = mkOption { @@ -44,7 +44,6 @@ in task = true; startOn = if cfg.autorun then "started udev" else null; - stopOn = "shutdown"; preStart = '' ${insmod} ${blcr_imports_ko} diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix index c723e1cd837..35f483411b2 100644 --- a/modules/services/monitoring/monit.nix +++ b/modules/services/monitoring/monit.nix @@ -27,6 +27,7 @@ in }; config = mkIf config.services.monit.enable { + environment.etc = [ { source = pkgs.writeTextFile { @@ -37,11 +38,11 @@ in mode = "0400"; } ]; + jobs.monit = { description = "Monit system watcher"; startOn = config.services.monit.startOn; - stopOn = "shutdown"; exec = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";