diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-18 18:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-18 18:01:22 +0000 |
| commit | 05782cfb75a6670252b0583d5bc7d4475033aa8e (patch) | |
| tree | 27e33ad6a15046c78a5b292c9531de7d3058a45c /nixos | |
| parent | 720a248b4479e7748e942fe1b28d3684bd5baaff (diff) | |
| parent | ea64ad20e3a0b2c17184317eeee64f352dc1b515 (diff) | |
| download | nixlib-05782cfb75a6670252b0583d5bc7d4475033aa8e.tar nixlib-05782cfb75a6670252b0583d5bc7d4475033aa8e.tar.gz nixlib-05782cfb75a6670252b0583d5bc7d4475033aa8e.tar.bz2 nixlib-05782cfb75a6670252b0583d5bc7d4475033aa8e.tar.lz nixlib-05782cfb75a6670252b0583d5bc7d4475033aa8e.tar.xz nixlib-05782cfb75a6670252b0583d5bc7d4475033aa8e.tar.zst nixlib-05782cfb75a6670252b0583d5bc7d4475033aa8e.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/binfmt.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 7f817e5d350d..98db67e7c00e 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -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 != {}) [ - "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) ]; + systemd = lib.mkIf (config.boot.binfmt.registrations != {}) { + additionalUpstreamSystemUnits = [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; + services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; + }; }; } |