diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2015-12-21 12:09:38 +0100 |
|---|---|---|
| committer | Nathan Zadoks <nathan@nathan7.eu> | 2016-03-02 21:00:47 +0100 |
| commit | 1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981 (patch) | |
| tree | beb4ea3075cb5c13715c7a929a1e5a0dabf0b108 /nixos | |
| parent | 397a0db028116a17036ff78f7b4aa8f020f42405 (diff) | |
| download | nixlib-1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981.tar nixlib-1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981.tar.gz nixlib-1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981.tar.bz2 nixlib-1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981.tar.lz nixlib-1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981.tar.xz nixlib-1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981.tar.zst nixlib-1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981.zip | |
systemd: enable upstream systemd-binfmt.service
Since we don't restart sysinit.service in switch-to-configuration, this additionally overrides systemd-binfmt.service to depend on proc-sys-fs-binfmt_misc.automount, which is normally provided by sysinit.service.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index c5ee95f4c9a4..a3c83521c354 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -160,6 +160,7 @@ let "systemd-timedated.service" "systemd-localed.service" "systemd-hostnamed.service" + "systemd-binfmt.service" ] ++ cfg.additionalUpstreamSystemUnits; @@ -779,6 +780,7 @@ in systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; + systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ]; # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; |