diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-01 16:35:11 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-03 16:36:23 +0200 |
| commit | b0b3fa928ad572c67bc3545c2b160bd8aef79d7a (patch) | |
| tree | 785358808d1ec412de51c9d7946e8465f7d71c6e /nixos/modules/virtualisation/containers.nix | |
| parent | 1ad9a654be1120a6844c9eb7520188e874178ebe (diff) | |
| download | nixpkgs-b0b3fa928ad572c67bc3545c2b160bd8aef79d7a.tar nixpkgs-b0b3fa928ad572c67bc3545c2b160bd8aef79d7a.tar.gz nixpkgs-b0b3fa928ad572c67bc3545c2b160bd8aef79d7a.tar.bz2 nixpkgs-b0b3fa928ad572c67bc3545c2b160bd8aef79d7a.tar.lz nixpkgs-b0b3fa928ad572c67bc3545c2b160bd8aef79d7a.tar.xz nixpkgs-b0b3fa928ad572c67bc3545c2b160bd8aef79d7a.tar.zst nixpkgs-b0b3fa928ad572c67bc3545c2b160bd8aef79d7a.zip | |
Disable container support in containers
Systemd-nspawn doesn't support nesting, so providing nixos-container inside a container doesn't make sense.
Diffstat (limited to 'nixos/modules/virtualisation/containers.nix')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 9be79cec369..097dd3993eb 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -140,7 +140,7 @@ in }; - config = { + config = mkIf (!config.boot.isContainer) { systemd.services."container@" = { description = "Container '%i'"; @@ -222,7 +222,8 @@ in postStart = '' # This blocks until the container-startup-done service - # writes something to this pipe. + # writes something to this pipe. FIXME: it also hangs + # until the start timeout expires if systemd-nspawn exits. read x < $root/var/lib/startup-done ''; |