dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Don't restart container shells in switch-to-configuration

Browse Source
This commit is contained in:
Eelco Dolstra 2014-04-15 11:22:31 +02:00
parent abdd87da3c
commit 596bd37163
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/virtualisation/container-config.nix
View File

@ -28,6 +28,7 @@ with lib;
ExecStart = "${pkgs.socat}/bin/socat -t0 - exec:${pkgs.shadow}/bin/login,pty,setsid,setpgid,stderr,ctty"; ExecStart = "${pkgs.socat}/bin/socat -t0 - exec:${pkgs.shadow}/bin/login,pty,setsid,setpgid,stderr,ctty";
TimeoutStopSec = 1; # FIXME TimeoutStopSec = 1; # FIXME
}; };
restartIfChanged = false;
}; };
# Also provide a root login prompt on /var/lib/root-login.socket # Also provide a root login prompt on /var/lib/root-login.socket
@ -52,6 +53,7 @@ with lib;
ExecStart = "${pkgs.socat}/bin/socat -t0 - \"exec:${pkgs.shadow}/bin/login -f root,pty,setsid,setpgid,stderr,ctty\""; ExecStart = "${pkgs.socat}/bin/socat -t0 - \"exec:${pkgs.shadow}/bin/login -f root,pty,setsid,setpgid,stderr,ctty\"";
TimeoutStopSec = 1; # FIXME TimeoutStopSec = 1; # FIXME
}; };
restartIfChanged = false;
}; };
# Provide a daemon on /var/lib/run-command.socket that reads a # Provide a daemon on /var/lib/run-command.socket that reads a
@ -82,6 +84,7 @@ with lib;
eval "command=($c)" eval "command=($c)"
exec "''${command[@]}" exec "''${command[@]}"
''; '';
restartIfChanged = false;
}; };
systemd.services.container-startup-done = systemd.services.container-startup-done =