diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-11 15:48:45 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-22 12:23:40 +0200 |
commit | 65700b435c8a495e5ff7071e41db34bf49b9ef89 (patch) | |
tree | af151e2f0f7436ecf46faf042e33ea8c5fd8e000 /nixos/modules | |
parent | cce3aa1e222385e846d53d8ad603637408c32037 (diff) | |
download | nixlib-65700b435c8a495e5ff7071e41db34bf49b9ef89.tar nixlib-65700b435c8a495e5ff7071e41db34bf49b9ef89.tar.gz nixlib-65700b435c8a495e5ff7071e41db34bf49b9ef89.tar.bz2 nixlib-65700b435c8a495e5ff7071e41db34bf49b9ef89.tar.lz nixlib-65700b435c8a495e5ff7071e41db34bf49b9ef89.tar.xz nixlib-65700b435c8a495e5ff7071e41db34bf49b9ef89.tar.zst nixlib-65700b435c8a495e5ff7071e41db34bf49b9ef89.zip |
Use ConditionVirtualization to disable some services in containers
(cherry picked from commit c52a98380673093037a3116025d0aa92cd46a214)
Diffstat (limited to 'nixos/modules')
-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 2ad12c51b218..d001feb063b4 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -749,6 +749,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; - }; } |