diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-12 20:03:14 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-12 20:03:14 -0400 |
| commit | 59a060523e820fa420a94a022755c37ca8b54192 (patch) | |
| tree | 63b4706a1456a395996ca8b310931dc8105a2f0e | |
| parent | 3ed3c60d0fba2f55c65afe91597dc9fdf07e1121 (diff) | |
| download | nixlib-59a060523e820fa420a94a022755c37ca8b54192.tar nixlib-59a060523e820fa420a94a022755c37ca8b54192.tar.gz nixlib-59a060523e820fa420a94a022755c37ca8b54192.tar.bz2 nixlib-59a060523e820fa420a94a022755c37ca8b54192.tar.lz nixlib-59a060523e820fa420a94a022755c37ca8b54192.tar.xz nixlib-59a060523e820fa420a94a022755c37ca8b54192.tar.zst nixlib-59a060523e820fa420a94a022755c37ca8b54192.zip | |
Don't override the baseUnit's PATH by default
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 3f92489b866a..7305fb17261a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -173,7 +173,7 @@ let serviceConfig = { name, config, ... }: { config = mkMerge - [ { # Default path for systemd services. Should be quite minimal. + [ (mkIf (config.baseUnit == null) { # Default path for systemd services. Should be quite minimal. path = [ pkgs.coreutils pkgs.findutils @@ -182,7 +182,7 @@ let systemd ]; environment.PATH = config.path; - } + }) (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' #! ${pkgs.stdenv.shell} -e |