movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-04 06:42:33 +03:00
Code Activity

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

Browse source 
binfmt: Don't create invalid service with no registrations
This commit is contained in:
Florian Klink 2023-02-18 15:39:46 +01:00 • committed by GitHub
commit 4bfb6411e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/system/boot/binfmt.nix
View file

@ -316,11 +316,13 @@ in {
mkdir -p -m 0755 /run/binfmt mkdir -p -m 0755 /run/binfmt
${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ${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 != {}) {
"proc-sys-fs-binfmt_misc.automount" additionalUpstreamSystemUnits = [
"proc-sys-fs-binfmt_misc.mount" "proc-sys-fs-binfmt_misc.automount"
"systemd-binfmt.service" "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) ];
};
}; };
} }