diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-25 09:35:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-25 09:35:09 +0000 |
| commit | 4d78ab0561de30f22ee27c5cd765a84a44a5a62c (patch) | |
| tree | 1ac2110732d17335abebb634af43e89e03937a4e /nixos | |
| parent | 98dc6b59bf334e77586126a4815cb2744ad3a55a (diff) | |
| parent | fc7070d133520a0bcb97c5350b0bfe30162f7f89 (diff) | |
| download | nixpkgs-4d78ab0561de30f22ee27c5cd765a84a44a5a62c.tar nixpkgs-4d78ab0561de30f22ee27c5cd765a84a44a5a62c.tar.gz nixpkgs-4d78ab0561de30f22ee27c5cd765a84a44a5a62c.tar.bz2 nixpkgs-4d78ab0561de30f22ee27c5cd765a84a44a5a62c.tar.lz nixpkgs-4d78ab0561de30f22ee27c5cd765a84a44a5a62c.tar.xz nixpkgs-4d78ab0561de30f22ee27c5cd765a84a44a5a62c.tar.zst nixpkgs-4d78ab0561de30f22ee27c5cd765a84a44a5a62c.zip | |
Merge pull request #72996 from elohmeier/containers-fix
nixos/containers: fix handling of cfg.additionalCapabilities
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 691ee2c136e..09678ce9ea7 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -149,7 +149,7 @@ let --setenv PATH="$PATH" \ ${optionalString cfg.ephemeral "--ephemeral"} \ ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then - ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else "" + ''--capability="${concatStringsSep "," cfg.additionalCapabilities}"'' else "" } \ ${if cfg.tmpfs != null && cfg.tmpfs != [] then ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else "" |