diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-11 15:48:45 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-11 18:18:35 +0200 |
| commit | c52a98380673093037a3116025d0aa92cd46a214 (patch) | |
| tree | 503ec29b4085d40ba31c37a8eb8193539be09739 | |
| parent | fe952a42a7898574a1a2f5ac4b386c6bdd713b2e (diff) | |
| download | nixlib-c52a98380673093037a3116025d0aa92cd46a214.tar nixlib-c52a98380673093037a3116025d0aa92cd46a214.tar.gz nixlib-c52a98380673093037a3116025d0aa92cd46a214.tar.bz2 nixlib-c52a98380673093037a3116025d0aa92cd46a214.tar.lz nixlib-c52a98380673093037a3116025d0aa92cd46a214.tar.xz nixlib-c52a98380673093037a3116025d0aa92cd46a214.tar.zst nixlib-c52a98380673093037a3116025d0aa92cd46a214.zip | |
Use ConditionVirtualization to disable some services in containers
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/container-config.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index fdaf4dabc392..d1e97e0b87f0 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -750,6 +750,10 @@ in systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; + # Don't bother with certain units in containers. + systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; + systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container"; + }; } diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index 67047541102c..c210c8d5f25e 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -19,10 +19,6 @@ with lib; # Shut up warnings about not having a boot loader. system.build.installBootLoader = "${pkgs.coreutils}/bin/true"; - systemd.services.systemd-remount-fs.enable = false; - - systemd.services.systemd-random-seed.enable = false; - }; } |