diff options
| author | Silvan Mosberger <github@infinisil.com> | 2022-03-25 19:05:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 19:05:35 +0100 |
| commit | 5a67e9db616f6118ef5c0e2241b43b437b6d6239 (patch) | |
| tree | 46571722ba9cefee2324f364e846e00bdeb1c457 /nixos/lib | |
| parent | f33719eda108fea4611a95d7d54a0dfb91c9ebc5 (diff) | |
| parent | c70a466d21fbd72f73cfc263e93f967e79953e73 (diff) | |
| download | nixpkgs-5a67e9db616f6118ef5c0e2241b43b437b6d6239.tar nixpkgs-5a67e9db616f6118ef5c0e2241b43b437b6d6239.tar.gz nixpkgs-5a67e9db616f6118ef5c0e2241b43b437b6d6239.tar.bz2 nixpkgs-5a67e9db616f6118ef5c0e2241b43b437b6d6239.tar.lz nixpkgs-5a67e9db616f6118ef5c0e2241b43b437b6d6239.tar.xz nixpkgs-5a67e9db616f6118ef5c0e2241b43b437b6d6239.tar.zst nixpkgs-5a67e9db616f6118ef5c0e2241b43b437b6d6239.zip | |
Merge pull request #133532 from Infinisil/systemd-unit-dirs
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/systemd-lib.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index a472d97f5cc..37900b0b16f 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -23,8 +23,9 @@ in rec { inherit (unit) text; } '' - mkdir -p $out - echo -n "$text" > $out/${shellEscape name} + name=${shellEscape name} + mkdir -p "$out/$(dirname "$name")" + echo -n "$text" > "$out/$name" '' else pkgs.runCommand "unit-${mkPathSafeName name}-disabled" @@ -32,8 +33,9 @@ in rec { allowSubstitutes = false; } '' - mkdir -p $out - ln -s /dev/null $out/${shellEscape name} + name=${shellEscape name} + mkdir -p "$out/$(dirname "$name")" + ln -s /dev/null "$out/$name" ''; boolValues = [true false "yes" "no"]; |