public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable container support in containers

Browse Source 
Systemd-nspawn doesn't support nesting, so providing nixos-container
inside a container doesn't make sense.
This commit is contained in:
Eelco Dolstra 2014-04-01 16:35:11 +02:00
parent 1ad9a654be
commit b0b3fa928a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/virtualisation/containers.nix
View File

@ -140,7 +140,7 @@ in
}; };
config = { config = mkIf (!config.boot.isContainer) {
systemd.services."container@" = systemd.services."container@" =
{ description = "Container '%i'"; { description = "Container '%i'";
@ -222,7 +222,8 @@ in
postStart = postStart =
'' ''
# This blocks until the container-startup-done service # 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 read x < $root/var/lib/startup-done
''; '';