winzlieb/network
winzlieb
/
network
forked from zentralwerk/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nixos-module/server/lxc-containers: undo making container startup conditional

This commit is contained in:
Astro 2021-11-24 01:05:56 +01:00
parent 5ed1091b74
commit 9d99508ae7
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nix/nixos-module/server/lxc-containers.nix
View File

@ -138,15 +138,6 @@ let
set -e set -e
''; '';
enable-script = pkgs.writeScriptBin "enable-containers" ''
touch /etc/start-containers
systemctl start lxc-containers.target
'';
disable-script = pkgs.writeScriptBin "disable-containers" ''
rm /etc/start-containers
systemctl stop lxc-containers.target lxc@\*.service
'';
in in
{ {
boot.kernel.sysctl = lib.mkIf enabled { boot.kernel.sysctl = lib.mkIf enabled {
@ -173,7 +164,6 @@ in
# `lxc-attach` et al # `lxc-attach` et al
pkgs.lxc build-script pkgs.lxc build-script
# User scripts # User scripts
enable-script disable-script
]; ];
# Create lxc.container.conf files # Create lxc.container.conf files
@ -227,7 +217,6 @@ in
after = [ "network.target" ]; after = [ "network.target" ];
unitConfig.ConditionPathExists = [ unitConfig.ConditionPathExists = [
"/var/lib/lxc/%i/rootfs/init" "/var/lib/lxc/%i/rootfs/init"
"/etc/start-containers"
]; ];
serviceConfig = with pkgs; { serviceConfig = with pkgs; {
Type = "simple"; Type = "simple";