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

binfmt: Don't create invalid service with no registrations

authored by Florian Klink and committed by GitHub 4bfb6411 b4e9968c

+8 -6
+8 -6
nixos/modules/system/boot/binfmt.nix
··· 316 mkdir -p -m 0755 /run/binfmt 317 ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} 318 ''; 319 - systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [ 320 - "proc-sys-fs-binfmt_misc.automount" 321 - "proc-sys-fs-binfmt_misc.mount" 322 - "systemd-binfmt.service" 323 - ]; 324 - systemd.services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; 325 }; 326 }
··· 316 mkdir -p -m 0755 /run/binfmt 317 ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} 318 ''; 319 + systemd = lib.mkIf (config.boot.binfmt.registrations != {}) { 320 + additionalUpstreamSystemUnits = [ 321 + "proc-sys-fs-binfmt_misc.automount" 322 + "proc-sys-fs-binfmt_misc.mount" 323 + "systemd-binfmt.service" 324 + ]; 325 + services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; 326 + }; 327 }; 328 }