Unverified Commit 4bfb6411 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #215188 from ElvishJerricco/binfmt-bad-setting-fix 

binfmt: Don't create invalid service with no registrations
parents b4e9968c b3a27afb

nixos/modules/system/boot/binfmt.nix

+8 −6
Original line number Diff line number Diff line
@@ -316,11 +316,13 @@ in { 
      mkdir -p -m 0755 /run/binfmt

      ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}

    '';

    systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [

    systemd = lib.mkIf (config.boot.binfmt.registrations != {}) {

      additionalUpstreamSystemUnits = [

        "proc-sys-fs-binfmt_misc.automount"

        "proc-sys-fs-binfmt_misc.mount"

        "systemd-binfmt.service"

      ];

    systemd.services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ];

      services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ];

    };

  };

}