Unverified Commit 053ab2f7 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #185153 from puppe/enable-container-warning 

nixos/nixos-containers: Fix ineffective warning
parents 4bd9ff72 82c64d15

nixos/modules/virtualisation/nixos-containers.nix

+5 −6
Original line number Diff line number Diff line
@@ -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) (