forked from mirrors/nixpkgs
* Remove `stopOn = "shutdown"' which doesn't work.
svn path=/nixos/trunk/; revision=22101
This commit is contained in:
parent
8519e72ccc
commit
d317d83ba8
|
@ -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}
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
Loading…
Reference in a new issue