diff options
| author | Martin Puppe <dev@mpuppe.de> | 2022-08-04 21:48:27 +0200 |
|---|---|---|
| committer | Martin Puppe <dev@mpuppe.de> | 2022-08-04 22:52:16 +0200 |
| commit | 82c64d154b2743f34092bc1be519845c4496142d (patch) | |
| tree | e1f1088be79ca6f9b6a5d691903c87fe7f855975 /nixos/modules/virtualisation/nixos-containers.nix | |
| parent | fb689e491647c4bc39054e4cdd6c7aa14b9e733b (diff) | |
| download | nixpkgs-82c64d154b2743f34092bc1be519845c4496142d.tar nixpkgs-82c64d154b2743f34092bc1be519845c4496142d.tar.gz nixpkgs-82c64d154b2743f34092bc1be519845c4496142d.tar.bz2 nixpkgs-82c64d154b2743f34092bc1be519845c4496142d.tar.lz nixpkgs-82c64d154b2743f34092bc1be519845c4496142d.tar.xz nixpkgs-82c64d154b2743f34092bc1be519845c4496142d.tar.zst nixpkgs-82c64d154b2743f34092bc1be519845c4496142d.zip | |
nixos/nixos-containers: Fix ineffective warning
A warning regarding enabling NixOS containers and virtualisation.containers at the same time with state versions < 22.05 had been added in commit 3c49151f154a3872eb278c214863d926a4f8abf6. But this warning had accidentally been defined in the wrong place, and the warning has therefore not actually been in effect. This commit fixes that.
Diffstat (limited to 'nixos/modules/virtualisation/nixos-containers.nix')
| -rw-r--r-- | nixos/modules/virtualisation/nixos-containers.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index e2fb28ed633..4f074d24fda 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -742,12 +742,6 @@ in config = mkIf (config.boot.enableContainers) (let - warnings = flatten [ - (optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") '' - Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported. - '') - ]; - unit = { description = "Container '%i'"; @@ -771,6 +765,11 @@ in serviceConfig = serviceDirectives dummyConfig; }; in { + warnings = + (optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") '' + Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported. + ''); + systemd.targets.multi-user.wants = [ "machines.target" ]; systemd.services = listToAttrs (filter (x: x.value != null) ( |