diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-18 18:01:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-18 18:01:58 +0000 |
| commit | 0e856cc7def0dd3d79d9d300a3fd06984e12b8d3 (patch) | |
| tree | 60f7e35f0aa12095dd61dc2495496f9fd592c5d3 /nixos | |
| parent | 76844dfcfd7425f54ca5f77a5379d71a685607e1 (diff) | |
| parent | 05782cfb75a6670252b0583d5bc7d4475033aa8e (diff) | |
| download | nixlib-0e856cc7def0dd3d79d9d300a3fd06984e12b8d3.tar nixlib-0e856cc7def0dd3d79d9d300a3fd06984e12b8d3.tar.gz nixlib-0e856cc7def0dd3d79d9d300a3fd06984e12b8d3.tar.bz2 nixlib-0e856cc7def0dd3d79d9d300a3fd06984e12b8d3.tar.lz nixlib-0e856cc7def0dd3d79d9d300a3fd06984e12b8d3.tar.xz nixlib-0e856cc7def0dd3d79d9d300a3fd06984e12b8d3.tar.zst nixlib-0e856cc7def0dd3d79d9d300a3fd06984e12b8d3.zip | |
Merge staging-next into staging
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) ]; + }; }; } |