From 9d99508ae718f1ed9a674ed96716565016c1d80b Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 24 Nov 2021 01:05:56 +0100 Subject: [PATCH] nixos-module/server/lxc-containers: undo making container startup conditional --- nix/nixos-module/server/lxc-containers.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/nix/nixos-module/server/lxc-containers.nix b/nix/nixos-module/server/lxc-containers.nix index 630a8d2..b84fce5 100644 --- a/nix/nixos-module/server/lxc-containers.nix +++ b/nix/nixos-module/server/lxc-containers.nix @@ -138,15 +138,6 @@ let 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 { boot.kernel.sysctl = lib.mkIf enabled { @@ -173,7 +164,6 @@ in # `lxc-attach` et al pkgs.lxc build-script # User scripts - enable-script disable-script ]; # Create lxc.container.conf files @@ -227,7 +217,6 @@ in after = [ "network.target" ]; unitConfig.ConditionPathExists = [ "/var/lib/lxc/%i/rootfs/init" - "/etc/start-containers" ]; serviceConfig = with pkgs; { Type = "simple";