diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-12-14 21:15:02 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2016-12-14 21:15:02 +0100 |
| commit | 4e5b3131740dade56b643a568a9d26bbe4b796ea (patch) | |
| tree | 78210802c291edaedceecdf31f2b0f2b2f3279cd /modules/services | |
| parent | e91ffd0ff39513387a2cd2e23f55c63eb84c0d62 (diff) | |
services.activate-system: retry if activation fails
this might fail a few times when /nix/store is on another filesystem.
Diffstat (limited to 'modules/services')
| -rw-r--r-- | modules/services/activate-system.nix | 5 | ||||
| -rw-r--r-- | modules/services/nix-daemon.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/services/activate-system.nix b/modules/services/activate-system.nix index 106c7ba..03742a1 100644 --- a/modules/services/activate-system.nix +++ b/modules/services/activate-system.nix @@ -38,10 +38,11 @@ in }; }; - config = { + config = mkIf cfg.enable { - launchd.daemons.activate-system = mkIf cfg.enable { + launchd.daemons.activate-system = { serviceConfig.Program = "${activateScript}"; + serviceConfig.KeepAlive.SuccessfulExit = false; serviceConfig.RunAtLoad = true; }; diff --git a/modules/services/nix-daemon.nix b/modules/services/nix-daemon.nix index 262ac3c..2d64bc5 100644 --- a/modules/services/nix-daemon.nix +++ b/modules/services/nix-daemon.nix @@ -39,9 +39,9 @@ in }; }; - config = { + config = mkIf cfg.enable { - launchd.daemons.nix-daemon = mkIf cfg.enable { + launchd.daemons.nix-daemon = { serviceConfig.Program = "${cfg.profile}/bin/nix-daemon"; serviceConfig.KeepAlive = true; serviceConfig.ProcessType = "Background"; |