diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-10-22 19:50:12 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-10-22 19:50:12 +0200 |
commit | 80fb17b251d163345ddf8aa14be283dd2f9cbcc5 (patch) | |
tree | 7269e949ca04ea32684ed05c645fba1dec2ab1e5 /nixos/modules/services/misc/nix-daemon.nix | |
parent | 26963cfc2dfd8ba6bce927535317d799dda15102 (diff) | |
download | nixpkgs-80fb17b251d163345ddf8aa14be283dd2f9cbcc5.tar nixpkgs-80fb17b251d163345ddf8aa14be283dd2f9cbcc5.tar.gz nixpkgs-80fb17b251d163345ddf8aa14be283dd2f9cbcc5.tar.bz2 nixpkgs-80fb17b251d163345ddf8aa14be283dd2f9cbcc5.tar.lz nixpkgs-80fb17b251d163345ddf8aa14be283dd2f9cbcc5.tar.xz nixpkgs-80fb17b251d163345ddf8aa14be283dd2f9cbcc5.tar.zst nixpkgs-80fb17b251d163345ddf8aa14be283dd2f9cbcc5.zip |
nixos/nix-daemon: Require .mount for /nix/store.
Also related to NixOS/nixops#350, because while switching to the new configuration, depending on /nix/store also propagates to the mount points for /nix/.ro-store and /nix/.rw-store and we don't get an error while trying to unmount them (because nix-daemon needs to be stopped for unmounting these paths). While Nix does have the option to set a different store path, I've found only hardcoded references in nix-daemon.nix, so I'm using a hardcoded reference here as well, because after all customizing the store path will probably only make sense on non-NixOS systems. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
-rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4aed91c3497..5f73191c639 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -366,6 +366,8 @@ in // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; } // config.networking.proxy.envVars; + unitConfig.RequiresMountsFor = "/nix/store"; + serviceConfig = { Nice = cfg.daemonNiceLevel; IOSchedulingPriority = cfg.daemonIONiceLevel; |