diff options
| author | Florian Klink <flokli@flokli.de> | 2020-05-18 19:43:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 19:43:25 +0200 |
| commit | 528d35bec0cb976a06cc0e8487c6e5136400b16b (patch) | |
| tree | 7ede5686dbff16105389a989cebce6c7ad1df151 /nixos/modules | |
| parent | b5caab6f7e6c520da2744d12b75f84a09df5ba64 (diff) | |
| parent | fd49155848a8ee8aa2f103fe765ddb9aed1b3d2d (diff) | |
| download | nixlib-528d35bec0cb976a06cc0e8487c6e5136400b16b.tar nixlib-528d35bec0cb976a06cc0e8487c6e5136400b16b.tar.gz nixlib-528d35bec0cb976a06cc0e8487c6e5136400b16b.tar.bz2 nixlib-528d35bec0cb976a06cc0e8487c6e5136400b16b.tar.lz nixlib-528d35bec0cb976a06cc0e8487c6e5136400b16b.tar.xz nixlib-528d35bec0cb976a06cc0e8487c6e5136400b16b.tar.zst nixlib-528d35bec0cb976a06cc0e8487c6e5136400b16b.zip | |
Merge pull request #87742 from flokli/systemd-binfmt
nixos/binfmt: move systemd-binfmt.service to binfmt module
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/system/boot/binfmt.nix | 9 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index a677ab4cb71a..9eeae0c3ef44 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -268,9 +268,10 @@ 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.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; }; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7c4dc93e2fb6..99892a28115c 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -164,7 +164,6 @@ let "systemd-timedated.service" "systemd-localed.service" "systemd-hostnamed.service" - "systemd-binfmt.service" "systemd-exit.service" "systemd-update-done.service" ] ++ optionals config.services.journald.enableHttpGateway [ @@ -1056,7 +1055,6 @@ in systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; - systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; systemd.services.systemd-importd.environment = proxy_env; # Don't bother with certain units in containers. |