Merge pull request #26191 from romildo/fix.mlocate

locate: fix creation of parent dir of database
2017-06-10 11:56:26 +01:00 · 2017-06-10 11:56:26 +01:00 · 9c0577447c
parent e6f6885da2 6ef6484dd6
commit 9c0577447c
1 changed files with 2 additions and 2 deletions
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@ -131,9 +131,9 @@ in {
        path = mkIf (!isMLocate) [ pkgs.su ];
        script =
          ''
-            install -m ${if isMLocate then "0750" else "0755"} -o root -g ${if isMLocate then "mlocate" else "root"} -d $(dirname ${cfg.output})
+            mkdir -m 0755 -p ${dirOf cfg.output}
            exec ${cfg.locate}/bin/updatedb \
-              ${optionalString (cfg.localuser != null) ''--localuser=${cfg.localuser}''} \
+              ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \
              --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
          '';
        environment = {