diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:12:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:20:05 +0200 |
| commit | 54eb2d10184124a8bd6cc01ff815c30aa8aebf35 (patch) | |
| tree | 2152ad58471446689a35e1466ef865baac1f8964 /nixos/modules/virtualisation | |
| parent | ee8cde8d1cc4faea6502ffac90af20bfe86328a2 (diff) | |
| parent | 1906fc5bd10a7bbab35136325fa3251a043361b2 (diff) | |
| download | nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.gz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.bz2 nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.lz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.xz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.zst nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.zip | |
Merge branch 'staging-next'
Status on Hydra for linuxes seems good enough: https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/ecs-agent.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/lxd.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix index fc51b159579e..93fefe56d1a5 100644 --- a/nixos/modules/virtualisation/ecs-agent.nix +++ b/nixos/modules/virtualisation/ecs-agent.nix @@ -38,9 +38,8 @@ in { if [ ! -z "$ECS_DATADIR" ]; then mkdir -p "$ECS_DATADIR" fi - ${cfg.package.bin}/bin/agent + ${cfg.package}/bin/agent ''; }; }; } - diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index de48d3a780e2..53b89a9f55b1 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -108,7 +108,7 @@ in ''; serviceConfig = { - ExecStart = "@${cfg.package.bin}/bin/lxd lxd --group lxd"; + ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd"; Type = "simple"; KillMode = "process"; # when stopping, leave the containers alone LimitMEMLOCK = "infinity"; |