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

View File

@ -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";